diff --git a/changes.md b/changes.md
index 4479d518b79..b1076ea0b75 100644
--- a/changes.md
+++ b/changes.md
@@ -1,15 +1,15 @@
 **Api changes**
 
 <details>
-<summary>Changed Property(s)</summary>
+<summary>Added Property(s)</summary>
 
-- :warning: changed property `actions` of type `MyBusinessUnitUpdate` from type `BusinessUnitUpdateAction[]` to `MyBusinessUnitUpdateAction[]`
+- added property `published` to type `ShoppingListLineItem`
 </details>
 
 
 <details>
-<summary>Added Property(s)</summary>
+<summary>Changed Property(s)</summary>
 
-- added property `published` to type `ShoppingListLineItem`
+- :warning: changed property `actions` of type `MyBusinessUnitUpdate` from type `BusinessUnitUpdateAction[]` to `MyBusinessUnitUpdateAction[]`
 </details>
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyApiClientsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyApiClientsByIDTest.java
index cad88a73bb2..5f2e8ade271 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyApiClientsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyApiClientsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyApiClientsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").apiClients().withId("test_ID").get().createHttpRequest(),
@@ -78,7 +71,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/api-clients/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").apiClients().withId("test_ID").get(), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyApiClientsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyApiClientsTest.java
index f80f9e186f7..6c8955cccd0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyApiClientsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyApiClientsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyApiClientsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").apiClients().get().withExpand("expand").createHttpRequest(),
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/api-clients", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").apiClients().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdBusinessUnitsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdBusinessUnitsByIDTest.java
index cbbee29d063..9849ea7d09b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdBusinessUnitsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdBusinessUnitsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdBusinessUnitsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -113,7 +106,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/as-associate/test_associateId/business-units/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdBusinessUnitsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdBusinessUnitsKeyByKeyTest.java
index 335b4b8affe..2192a9387ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdBusinessUnitsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdBusinessUnitsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdBusinessUnitsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -115,7 +108,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/as-associate/test_associateId/business-units/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdBusinessUnitsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdBusinessUnitsTest.java
index af42a248706..926fb162bda 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdBusinessUnitsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdBusinessUnitsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdBusinessUnitsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -172,7 +165,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/as-associate/test_associateId/business-units", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalFlowsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalFlowsByIDTest.java
index b655cddf4c9..5050959deae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalFlowsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalFlowsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalFlowsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -111,7 +104,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/approval-flows/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalFlowsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalFlowsTest.java
index 98ff7c3f5fb..7cb3dccfee0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalFlowsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalFlowsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalFlowsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -152,7 +145,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/approval-flows", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesByIDTest.java
index 4c5a311d2ec..88177582d40 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -111,7 +104,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/approval-rules/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesKeyByKeyTest.java
index c1ffe111f7d..bf6affdb423 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -111,7 +104,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/approval-rules/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesTest.java
index 7e22a5bf593..bfc18701993 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyApprovalRulesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -173,7 +166,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/approval-rules", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsByIDTest.java
index 3c1adff4b2d..8c2867664ba 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -169,7 +162,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/carts/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsKeyByKeyTest.java
index 72b6629eccd..7f279dcd83b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -169,7 +162,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/carts/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsReplicateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsReplicateTest.java
index 60b1ae88c60..b3319b5faaa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsReplicateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsReplicateTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsReplicateTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -76,7 +69,6 @@ public static Object[][] requestWithMethodParameters() {
                 "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/carts/replicate", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .asAssociate()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsTest.java
index 73bb40dffec..1692421e225 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyCartsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -194,7 +187,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/carts", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersByIDTest.java
index d28c4f3c2ef..c132741df43 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -122,7 +115,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/orders/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersOrderNumberByOrderNumberTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersOrderNumberByOrderNumberTest.java
index c215d612e82..58488efaa3a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersOrderNumberByOrderNumberTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersOrderNumberByOrderNumberTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersOrderNumberByOrderNumberTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -122,7 +115,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/orders/order-number=test_orderNumber", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersQuotesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersQuotesTest.java
index 2f9cbd55583..d330ade70df 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersQuotesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersQuotesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersQuotesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -76,7 +69,6 @@ public static Object[][] requestWithMethodParameters() {
                 "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/orders/quotes", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .asAssociate()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersTest.java
index 2082b7fe8bf..925b20b1fbe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyOrdersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -194,7 +187,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/orders", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsByIDTest.java
index 10aca2b6bbf..59f3d1c9ae2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -122,7 +115,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/quote-requests/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsKeyByKeyTest.java
index 781077b2eec..36171f5a96a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -122,7 +115,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/quote-requests/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsTest.java
index a7321487aa4..29f64044598 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuoteRequestsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -194,7 +187,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/quote-requests", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesByIDTest.java
index d7490685cef..299e479f9b3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -122,7 +115,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/quotes/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesKeyByKeyTest.java
index 9b78dcbe54c..c7fd2a70739 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -122,7 +115,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/quotes/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesTest.java
index cc5d88a1250..cfb0fb95553 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyQuotesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -173,7 +166,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/quotes", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsByIDTest.java
index 1ab4765e435..edbcf2ea094 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -169,7 +162,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/shopping-lists/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsKeyByKeyTest.java
index b9167892a44..6b0c19c374f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -169,7 +162,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/shopping-lists/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsTest.java
index 8d786a6f374..8a44e4ce227 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyShoppingListsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -194,7 +187,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/as-associate/test_associateId/in-business-unit/key=test_businessUnitKey/shopping-lists", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyTest.java
index 7020d7bcef8..3a3821f7df8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.api.client.resource;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdInBusinessUnitKeyByBusinessUnitKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdTest.java
index 4dd5e41d39d..8223b7042af 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateByAssociateIdTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.api.client.resource;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateByAssociateIdTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateTest.java
index e944a2eca19..3d467930403 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAsAssociateTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.api.client.resource;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAsAssociateTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAssociateRolesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAssociateRolesByIDTest.java
index b540097f875..6ea067ed0ca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAssociateRolesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAssociateRolesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAssociateRolesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -114,7 +107,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/associate-roles/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAssociateRolesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAssociateRolesKeyByKeyTest.java
index d409f4f1385..b04b3bc1512 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAssociateRolesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAssociateRolesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAssociateRolesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/associate-roles/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAssociateRolesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAssociateRolesTest.java
index af4224ea0e6..38a9e3e2987 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAssociateRolesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAssociateRolesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAssociateRolesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/associate-roles", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").associateRoles().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAttributeGroupsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAttributeGroupsByIDTest.java
index 36a3144af0a..5b27da6172b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAttributeGroupsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAttributeGroupsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAttributeGroupsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -116,7 +109,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/attribute-groups/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAttributeGroupsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAttributeGroupsKeyByKeyTest.java
index 21f0b1940a6..62299585ac4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAttributeGroupsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAttributeGroupsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAttributeGroupsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/attribute-groups/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAttributeGroupsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAttributeGroupsTest.java
index 90a94d96b90..2689a438bec 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAttributeGroupsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyAttributeGroupsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyAttributeGroupsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/attribute-groups", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] {
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsByBusinessUnitIdAssociatesByAssociateIdTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsByBusinessUnitIdAssociatesByAssociateIdTest.java
index c6b0c546c71..e1f4879c9c2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsByBusinessUnitIdAssociatesByAssociateIdTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsByBusinessUnitIdAssociatesByAssociateIdTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyBusinessUnitsByBusinessUnitIdAssociatesByAssociateIdTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "get", "test_projectKey/business-units/test_businessUnitId/associates/test_associateId", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .businessUnits()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsByIDTest.java
index 4cf9e4be4c3..a7417bf8d29 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyBusinessUnitsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/business-units/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsKeyByKeyAssociatesByAssociateIdTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsKeyByKeyAssociatesByAssociateIdTest.java
index d83e3c7ac9f..5a76184c34b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsKeyByKeyAssociatesByAssociateIdTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsKeyByKeyAssociatesByAssociateIdTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyBusinessUnitsKeyByKeyAssociatesByAssociateIdTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -72,7 +65,6 @@ public static Object[][] requestWithMethodParameters() {
                 "get", "test_projectKey/business-units/key=test_key/associates/test_associateId", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .businessUnits()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsKeyByKeyTest.java
index f9e68bdeb8c..36cf2a69a8f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyBusinessUnitsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/business-units/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsSearchIndexingStatusTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsSearchIndexingStatusTest.java
index 5e23a6afa28..77ce872c292 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsSearchIndexingStatusTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsSearchIndexingStatusTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyBusinessUnitsSearchIndexingStatusTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                         "get", "test_projectKey/business-units/search/indexing-status", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").businessUnits().searchIndexingStatus().get(), } };
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsSearchTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsSearchTest.java
index 9e0b3c59f26..8052fea1a31 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsSearchTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsSearchTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyBusinessUnitsSearchTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -74,7 +67,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/business-units/search", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsTest.java
index 219dfc76487..0ec4ac8775e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyBusinessUnitsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyBusinessUnitsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/business-units", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").businessUnits().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartDiscountsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartDiscountsByIDTest.java
index 1088df6770f..ee64a9f1b21 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartDiscountsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartDiscountsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCartDiscountsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/cart-discounts/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartDiscountsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartDiscountsKeyByKeyTest.java
index fedf4936ecf..53777f3ea77 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartDiscountsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartDiscountsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCartDiscountsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/cart-discounts/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartDiscountsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartDiscountsTest.java
index 8cb7a066b10..7f130f122d9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartDiscountsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartDiscountsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCartDiscountsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/cart-discounts", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").cartDiscounts().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsByIDTest.java
index 20d867919f7..1db3080af9d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCartsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/carts/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").carts().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsCustomerIdByCustomerIdTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsCustomerIdByCustomerIdTest.java
index cac28d82409..25480842e8f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsCustomerIdByCustomerIdTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsCustomerIdByCustomerIdTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCartsCustomerIdByCustomerIdTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -84,7 +77,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "head", "test_projectKey/carts/customer-id=test_customerId", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsKeyByKeyTest.java
index 8b46763b366..8460b784ae0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCartsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -116,7 +109,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/carts/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").carts().withKey("test_key").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsReplicateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsReplicateTest.java
index 3ac8940b1f2..1e684dc9af5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsReplicateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsReplicateTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCartsReplicateTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .carts()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/carts/replicate", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .carts()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsTest.java
index 34348a5d265..e0950b7026c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCartsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCartsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").carts().get().withExpand("expand").createHttpRequest(), "get",
@@ -103,7 +96,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/carts", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").carts().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCategoriesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCategoriesByIDTest.java
index f8fc0c35e54..7b74319ba4d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCategoriesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCategoriesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCategoriesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -110,7 +103,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/categories/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").categories().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCategoriesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCategoriesKeyByKeyTest.java
index 2a3bf0195ae..1e4ef63b596 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCategoriesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCategoriesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCategoriesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -114,7 +107,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/categories/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCategoriesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCategoriesTest.java
index 3de9c2e7bdf..c171de554f0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCategoriesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCategoriesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCategoriesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").categories().get().withExpand("expand").createHttpRequest(),
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/categories", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").categories().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyChannelsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyChannelsByIDTest.java
index f7ccf40fcb6..08f31d5f6d9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyChannelsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyChannelsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyChannelsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -110,7 +103,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/channels/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").channels().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyChannelsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyChannelsKeyByKeyTest.java
index 7001addeda3..827a96be6a1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyChannelsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyChannelsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyChannelsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/channels/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").channels().withKey("test_key").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyChannelsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyChannelsTest.java
index d37a53fde6d..f9b4882afed 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyChannelsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyChannelsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyChannelsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").channels().get().withExpand("expand").createHttpRequest(),
@@ -110,7 +103,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/channels", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").channels().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomObjectsByContainerByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomObjectsByContainerByKeyTest.java
index a445b40c02e..e34ccc82a92 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomObjectsByContainerByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomObjectsByContainerByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomObjectsByContainerByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/custom-objects/test_container/test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomObjectsByContainerTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomObjectsByContainerTest.java
index 17232bc75c0..dcd36617317 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomObjectsByContainerTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomObjectsByContainerTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomObjectsByContainerTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -125,7 +118,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "get", "test_projectKey/custom-objects/test_container", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomObjectsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomObjectsTest.java
index d92f1ced79a..fdc040cbc5e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomObjectsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomObjectsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomObjectsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/custom-objects", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").customObjects().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomerGroupsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomerGroupsByIDTest.java
index d62fd4cb575..80e31e5104d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomerGroupsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomerGroupsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomerGroupsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -114,7 +107,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/customer-groups/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomerGroupsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomerGroupsKeyByKeyTest.java
index acc2d13dcaa..3704c0c93c5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomerGroupsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomerGroupsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomerGroupsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/customer-groups/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomerGroupsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomerGroupsTest.java
index 9bd3976a4ab..f1a48c9f7ce 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomerGroupsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomerGroupsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomerGroupsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").customerGroups().get().withWhere("where").createHttpRequest(),
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/customer-groups", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").customerGroups().get().withWhere("where"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersByIDTest.java
index 9ebf3b7831e..3cae51ad22a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -116,7 +109,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/customers/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").customers().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersEmailConfirmTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersEmailConfirmTest.java
index 5ca41e022ec..758ac684cdf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersEmailConfirmTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersEmailConfirmTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersEmailConfirmTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .customers()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/customers/email/confirm", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .customers()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersEmailTokenByEmailTokenTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersEmailTokenByEmailTokenTest.java
index c9d764740d4..7caa421de4e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersEmailTokenByEmailTokenTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersEmailTokenByEmailTokenTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersEmailTokenByEmailTokenTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -81,7 +74,6 @@ public static Object[][] requestWithMethodParameters() {
                         "get", "test_projectKey/customers/email-token=test_emailToken", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersEmailTokenTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersEmailTokenTest.java
index ba5d73fdf5a..0745b3bb77d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersEmailTokenTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersEmailTokenTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersEmailTokenTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .customers()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/customers/email-token", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .customers()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersKeyByKeyTest.java
index 96b81c42958..fd0b570a66e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -120,7 +113,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/customers/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").customers().withKey("test_key").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordResetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordResetTest.java
index 656b799d39f..50a0ee174ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordResetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordResetTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersPasswordResetTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .customers()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/customers/password/reset", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .customers()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordTest.java
index f28d4e8dc94..90ce3327b61 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersPasswordTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .customers()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/customers/password", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .customers()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordTokenByPasswordTokenTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordTokenByPasswordTokenTest.java
index a4af33a3ed2..87b0fd24056 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordTokenByPasswordTokenTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordTokenByPasswordTokenTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersPasswordTokenByPasswordTokenTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -81,7 +74,6 @@ public static Object[][] requestWithMethodParameters() {
                         "get", "test_projectKey/customers/password-token=test_passwordToken", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordTokenTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordTokenTest.java
index 9ee16e82401..cc8a8ac7271 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordTokenTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersPasswordTokenTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersPasswordTokenTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .customers()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/customers/password-token", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .customers()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersSearchIndexingStatusTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersSearchIndexingStatusTest.java
index 67d22b943ea..b2d43655047 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersSearchIndexingStatusTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersSearchIndexingStatusTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersSearchIndexingStatusTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,14 +55,12 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").customers().searchIndexingStatus().get().createHttpRequest(),
                 "get", "test_projectKey/customers/search/indexing-status", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").customers().searchIndexingStatus().get(), } };
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersSearchTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersSearchTest.java
index bd418d65068..25ae9d916e8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersSearchTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersSearchTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersSearchTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -74,7 +67,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/customers/search", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersTest.java
index 4c0f5e6a026..ab6bf2a7ae3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyCustomersTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").customers().get().withExpand("expand").createHttpRequest(),
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/customers", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").customers().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyDiscountCodesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyDiscountCodesByIDTest.java
index 6e787fb9afb..da493303ca7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyDiscountCodesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyDiscountCodesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyDiscountCodesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -120,7 +113,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/discount-codes/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyDiscountCodesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyDiscountCodesKeyByKeyTest.java
index 6f86a488955..8e7d1be31fb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyDiscountCodesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyDiscountCodesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyDiscountCodesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -126,7 +119,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/discount-codes/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyDiscountCodesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyDiscountCodesTest.java
index 4ed3e85be36..1ef46adb2d1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyDiscountCodesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyDiscountCodesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyDiscountCodesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/discount-codes", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").discountCodes().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyExtensionsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyExtensionsByIDTest.java
index dff102f0b43..531eaa64439 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyExtensionsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyExtensionsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyExtensionsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").extensions().withId("test_ID").get().createHttpRequest(),
@@ -89,7 +82,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/extensions/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").extensions().withId("test_ID").get(), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyExtensionsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyExtensionsKeyByKeyTest.java
index 2afe094f5f9..663a3ae680b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyExtensionsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyExtensionsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyExtensionsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").extensions().withKey("test_key").get().createHttpRequest(),
@@ -89,7 +82,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/extensions/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").extensions().withKey("test_key").get(), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyExtensionsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyExtensionsTest.java
index 75c00d2f637..c2b0ac11ba3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyExtensionsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyExtensionsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyExtensionsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").extensions().get().withSort("sort").createHttpRequest(),
@@ -102,7 +95,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/extensions", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").extensions().get().withSort("sort"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyGraphqlTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyGraphqlTest.java
index dba635ce677..95041dd7535 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyGraphqlTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyGraphqlTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyGraphqlTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .graphql()
@@ -69,7 +62,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/graphql", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .graphql()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyMeCustomersTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyMeCustomersTest.java
index b8be83f4de5..fd8f5831bb6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyMeCustomersTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyMeCustomersTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyMeCustomersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/in-business-unit/key=test_businessUnitKey/me/customers", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inBusinessUnitKeyWithBusinessUnitKeyValue("test_businessUnitKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyMeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyMeTest.java
index 10c793e9536..d4d25bdd22e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyMeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyMeTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.api.client.resource;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyMeTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyTest.java
index 599597e74d7..c8368e6ee35 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.api.client.resource;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInBusinessUnitKeyByBusinessUnitKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsByBusinessUnitIdAssociatesByAssociateIdTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsByBusinessUnitIdAssociatesByAssociateIdTest.java
index e61ac347a59..a3c19f707fb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsByBusinessUnitIdAssociatesByAssociateIdTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsByBusinessUnitIdAssociatesByAssociateIdTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsByBusinessUnitIdAssociatesByAssociateIdTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -75,7 +68,6 @@ public static Object[][] requestWithMethodParameters() {
                 "test_projectKey/in-store/key=test_storeKey/business-units/test_businessUnitId/associates/test_associateId", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsByIDTest.java
index 59ba8043743..e81ef71d6fa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -134,7 +127,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/business-units/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsKeyByKeyAssociatesByAssociateIdTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsKeyByKeyAssociatesByAssociateIdTest.java
index 26f47e83630..1a4236fdf40 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsKeyByKeyAssociatesByAssociateIdTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsKeyByKeyAssociatesByAssociateIdTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsKeyByKeyAssociatesByAssociateIdTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -74,7 +67,6 @@ public static Object[][] requestWithMethodParameters() {
                 "test_projectKey/in-store/key=test_storeKey/business-units/key=test_key/associates/test_associateId", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsKeyByKeyTest.java
index 8a191f4449a..9fff6221831 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -137,7 +130,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/business-units/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsTest.java
index 312808ffe0e..6cd59f469d6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyBusinessUnitsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -159,7 +152,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/business-units", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartDiscountsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartDiscountsByIDTest.java
index 3764b35f5a8..967dde9293e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartDiscountsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartDiscountsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCartDiscountsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -134,7 +127,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/cart-discounts/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartDiscountsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartDiscountsKeyByKeyTest.java
index 03057a4f6e8..22fd9ab3f0d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartDiscountsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartDiscountsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCartDiscountsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -137,7 +130,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/cart-discounts/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartDiscountsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartDiscountsTest.java
index ec4eee9c2f4..ddf53974015 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartDiscountsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartDiscountsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCartDiscountsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -159,7 +152,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/cart-discounts", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsByIDTest.java
index 86a5733fb0c..8d7b8d75508 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCartsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -143,7 +136,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/carts/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsCustomerIdByCustomerIdTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsCustomerIdByCustomerIdTest.java
index b3fbc79e015..dd338944547 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsCustomerIdByCustomerIdTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsCustomerIdByCustomerIdTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCartsCustomerIdByCustomerIdTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -92,7 +85,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/in-store/key=test_storeKey/carts/customer-id=test_customerId", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsKeyByKeyTest.java
index b855675141c..731b2006755 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCartsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -143,7 +136,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/carts/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsReplicateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsReplicateTest.java
index fc38dbc4e9b..c440405d645 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsReplicateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsReplicateTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCartsReplicateTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -74,7 +67,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/carts/replicate", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsTest.java
index 4639250c305..dafe1679f66 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCartsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCartsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -153,7 +146,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/in-store/key=test_storeKey/carts", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersByIDTest.java
index 629999d4069..17d81de0179 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCustomersByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -143,7 +136,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/customers/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersEmailConfirmTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersEmailConfirmTest.java
index 0ee4df4ba8c..b83171f142c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersEmailConfirmTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersEmailConfirmTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCustomersEmailConfirmTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/in-store/key=test_storeKey/customers/email/confirm", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersEmailTokenByEmailTokenTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersEmailTokenByEmailTokenTest.java
index 3221759424c..b55cc5136f6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersEmailTokenByEmailTokenTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersEmailTokenByEmailTokenTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCustomersEmailTokenByEmailTokenTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -83,7 +76,6 @@ public static Object[][] requestWithMethodParameters() {
                         "get", "test_projectKey/in-store/key=test_storeKey/customers/email-token=test_emailToken", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersEmailTokenTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersEmailTokenTest.java
index 62579b71b0d..e4e37bc5a83 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersEmailTokenTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersEmailTokenTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCustomersEmailTokenTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/in-store/key=test_storeKey/customers/email-token", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersKeyByKeyTest.java
index 1bb8019dbd7..9f1e18a3794 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCustomersKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -144,7 +137,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/customers/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordResetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordResetTest.java
index fd16dd7865f..dc12659555c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordResetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordResetTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordResetTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/in-store/key=test_storeKey/customers/password/reset", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTest.java
index c5f9776bcc9..541d4509663 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/in-store/key=test_storeKey/customers/password", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTokenByPasswordTokenTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTokenByPasswordTokenTest.java
index bdc9eb1486e..177d07cc4f0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTokenByPasswordTokenTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTokenByPasswordTokenTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTokenByPasswordTokenTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -84,7 +77,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/in-store/key=test_storeKey/customers/password-token=test_passwordToken", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTokenTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTokenTest.java
index db74baad89e..73e3f2ad14b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTokenTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTokenTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCustomersPasswordTokenTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/in-store/key=test_storeKey/customers/password-token", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersTest.java
index 1297f5069c3..9d34cb3e2c0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyCustomersTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyCustomersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -155,7 +148,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/customers", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyLoginTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyLoginTest.java
index f4a29da1a70..c5ecf1a653e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyLoginTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyLoginTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyLoginTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/in-store/key=test_storeKey/login", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeActiveCartTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeActiveCartTest.java
index bd272116858..37bc13a1d67 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeActiveCartTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeActiveCartTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMeActiveCartTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -91,7 +84,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/in-store/key=test_storeKey/me/active-cart", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeCartsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeCartsByIDTest.java
index e21a294cff3..7b6b0c7b8d4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeCartsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeCartsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMeCartsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -142,7 +135,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/me/carts/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeCartsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeCartsTest.java
index 95b833963a8..203e9a38458 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeCartsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeCartsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMeCartsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -167,7 +160,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/me/carts", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeEmailConfirmTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeEmailConfirmTest.java
index 4f133a527d6..a414786386d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeEmailConfirmTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeEmailConfirmTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMeEmailConfirmTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/in-store/key=test_storeKey/me/email/confirm", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeLoginTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeLoginTest.java
index 55e87a62921..2807eed0072 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeLoginTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeLoginTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMeLoginTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -74,7 +67,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/me/login", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeOrdersByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeOrdersByIDTest.java
index ab89db4dad6..923b6ab30b7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeOrdersByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeOrdersByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMeOrdersByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -94,7 +87,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/in-store/key=test_storeKey/me/orders/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeOrdersTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeOrdersTest.java
index cd0278da509..a18428021b7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeOrdersTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeOrdersTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMeOrdersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -167,7 +160,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/me/orders", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMePasswordResetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMePasswordResetTest.java
index 94b42fe1f42..4087b2e1788 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMePasswordResetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMePasswordResetTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMePasswordResetTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -74,7 +67,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/in-store/key=test_storeKey/me/password/reset", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMePasswordTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMePasswordTest.java
index a2542263935..8e6feb845fa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMePasswordTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMePasswordTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMePasswordTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -74,7 +67,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/me/password", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsByIDTest.java
index 3c4e444002e..e36892ec6e6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -154,7 +147,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/me/shopping-lists/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsKeyByKeyTest.java
index 26ced12fece..ac770a5b7bb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -157,7 +150,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/me/shopping-lists/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsTest.java
index 9e27de8b53d..a23e667f651 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMeShoppingListsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -172,7 +165,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/me/shopping-lists", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeSignupTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeSignupTest.java
index 64853cf251c..9bb16e7a406 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeSignupTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeSignupTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMeSignupTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -74,7 +67,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/me/signup", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeTest.java
index 71ae077680b..68462d0518f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyMeTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyMeTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -143,7 +136,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/in-store/key=test_storeKey/me", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersByIDTest.java
index 1e896d0eee2..f7cf559c09b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyOrdersByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -143,7 +136,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/orders/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersOrderNumberByOrderNumberTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersOrderNumberByOrderNumberTest.java
index 33a86875f19..3feba2c376d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersOrderNumberByOrderNumberTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersOrderNumberByOrderNumberTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyOrdersOrderNumberByOrderNumberTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -148,7 +141,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/in-store/key=test_storeKey/orders/order-number=test_orderNumber", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersQuotesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersQuotesTest.java
index a3031b43c54..736b99dd054 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersQuotesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersQuotesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyOrdersQuotesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -74,7 +67,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/orders/quotes", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .inStoreKeyWithStoreKeyValue("test_storeKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersTest.java
index a34caa1e2ae..d77fddab433 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyOrdersTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyOrdersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -153,7 +146,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/in-store/key=test_storeKey/orders", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductProjectionsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductProjectionsByIDTest.java
index dfbf472a474..48dcb47b1cf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductProjectionsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductProjectionsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyProductProjectionsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -161,7 +154,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/in-store/key=test_storeKey/product-projections/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductProjectionsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductProjectionsKeyByKeyTest.java
index 059e9110cc1..59ed07466a2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductProjectionsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductProjectionsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyProductProjectionsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -162,7 +155,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/in-store/key=test_storeKey/product-projections/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductProjectionsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductProjectionsTest.java
index 7aae16864b5..2f741fa2ca6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductProjectionsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductProjectionsTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.api.client.resource;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyProductProjectionsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductSelectionAssignmentsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductSelectionAssignmentsTest.java
index 7371262469f..0d7c988eeed 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductSelectionAssignmentsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductSelectionAssignmentsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyProductSelectionAssignmentsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -125,7 +118,6 @@ public static Object[][] requestWithMethodParameters() {
                         "get", "test_projectKey/in-store/key=test_storeKey/product-selection-assignments", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductTailoringTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductTailoringTest.java
index c655886aa13..23898fa5e4a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductTailoringTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductTailoringTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyProductTailoringTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -145,7 +138,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/product-tailoring", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDProductTailoringImagesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDProductTailoringImagesTest.java
index 409d6ef092e..6777e17330b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDProductTailoringImagesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDProductTailoringImagesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDProductTailoringImagesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/in-store/key=test_storeKey/products/test_productID/product-tailoring/images", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDProductTailoringTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDProductTailoringTest.java
index 567ff51cdb1..71694719e45 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDProductTailoringTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDProductTailoringTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDProductTailoringTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -139,7 +132,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/in-store/key=test_storeKey/products/test_productID/product-tailoring", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDTest.java
index 590ba7521cb..4b21e2ae97c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.api.client.resource;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyProductsByProductIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyProductTailoringImagesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyProductTailoringImagesTest.java
index dc2d4512427..b0789903c8f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyProductTailoringImagesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyProductTailoringImagesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyProductTailoringImagesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/in-store/key=test_storeKey/products/key=test_productKey/product-tailoring/images", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyProductTailoringTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyProductTailoringTest.java
index fcd12fbc1d1..281452d6ebf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyProductTailoringTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyProductTailoringTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyProductTailoringTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey")
@@ -139,7 +132,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/in-store/key=test_storeKey/products/key=test_productKey/product-tailoring", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyTest.java
index 177f0bc65bf..0b58454a229 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.api.client.resource;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyProductsKeyByProductKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsTest.java
index 3b748b2cd04..ef3acd57efa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyProductsTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.api.client.resource;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyProductsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsByIDTest.java
index 3a5dd32ee4a..22fe82f2a18 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -144,7 +137,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/quote-requests/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsKeyByKeyTest.java
index ecf47286dba..498978c106b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -147,7 +140,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/quote-requests/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsTest.java
index a77459dd823..2bc9fb36b1d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyQuoteRequestsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -159,7 +152,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/quote-requests", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuotesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuotesByIDTest.java
index 8e5c5c633d4..e8efd13fe47 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuotesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuotesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyQuotesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -143,7 +136,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/quotes/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuotesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuotesKeyByKeyTest.java
index f6270dbd0f2..275564b5ea7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuotesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuotesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyQuotesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -143,7 +136,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/quotes/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuotesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuotesTest.java
index a4cd1bce6db..2bb019dda26 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuotesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyQuotesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyQuotesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -153,7 +146,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/in-store/key=test_storeKey/quotes", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShippingMethodsMatchingCartTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShippingMethodsMatchingCartTest.java
index 0870fa3fb01..54e0cc51522 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShippingMethodsMatchingCartTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShippingMethodsMatchingCartTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyShippingMethodsMatchingCartTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/in-store/key=test_storeKey/shipping-methods/matching-cart", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShippingMethodsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShippingMethodsTest.java
index 0a340f5efa2..4c6d2912d6b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShippingMethodsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShippingMethodsTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.api.client.resource;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyShippingMethodsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShoppingListsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShoppingListsByIDTest.java
index dcd147064bf..df1e40958f9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShoppingListsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShoppingListsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyShoppingListsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -144,7 +137,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/shopping-lists/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShoppingListsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShoppingListsKeyByKeyTest.java
index 0f9689645c0..cea79bf507c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShoppingListsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShoppingListsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyShoppingListsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -147,7 +140,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/shopping-lists/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShoppingListsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShoppingListsTest.java
index 3508f470f85..a5da87fe334 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShoppingListsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyShoppingListsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyShoppingListsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -159,7 +152,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/shopping-lists", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyStagedQuotesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyStagedQuotesByIDTest.java
index f091164ec14..1abbe7f3b49 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyStagedQuotesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyStagedQuotesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyStagedQuotesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -144,7 +137,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/staged-quotes/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyStagedQuotesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyStagedQuotesKeyByKeyTest.java
index 1e62afbecf6..1c154dbdc24 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyStagedQuotesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyStagedQuotesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyStagedQuotesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -146,7 +139,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/in-store/key=test_storeKey/staged-quotes/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyStagedQuotesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyStagedQuotesTest.java
index 814930856ec..4e821b53abc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyStagedQuotesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyStagedQuotesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyStagedQuotesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -159,7 +152,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/in-store/key=test_storeKey/staged-quotes", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyTest.java
index d2bca02a4d4..a2eea8061b5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInStoreKeyByStoreKeyTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.api.client.resource;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInStoreKeyByStoreKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInventoryByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInventoryByIDTest.java
index de7070b05a4..5bd6c41d8b2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInventoryByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInventoryByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInventoryByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -110,7 +103,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/inventory/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").inventory().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInventoryKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInventoryKeyByKeyTest.java
index 1b5a1a48429..f7401e398f8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInventoryKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInventoryKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInventoryKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/inventory/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").inventory().withKey("test_key").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInventoryTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInventoryTest.java
index 63314df06ad..15bea16e348 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInventoryTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyInventoryTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInventoryTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").inventory().get().withExpand("expand").createHttpRequest(),
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/inventory", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").inventory().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyLoginTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyLoginTest.java
index cae047cc541..1958810fbd7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyLoginTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyLoginTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyLoginTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .login()
@@ -69,7 +62,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/login", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .login()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeActiveCartTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeActiveCartTest.java
index 12ae6434ec3..54e50568de7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeActiveCartTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeActiveCartTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeActiveCartTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -76,7 +69,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/me/active-cart", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] {
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeBusinessUnitsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeBusinessUnitsByIDTest.java
index cd3352b354d..f688a4133ca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeBusinessUnitsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeBusinessUnitsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeBusinessUnitsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -102,7 +95,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/me/business-units/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeBusinessUnitsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeBusinessUnitsKeyByKeyTest.java
index 0fb8fc8e3f7..7accd1ac751 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeBusinessUnitsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeBusinessUnitsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeBusinessUnitsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -102,7 +95,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/me/business-units/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeBusinessUnitsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeBusinessUnitsTest.java
index 040a11cfb39..ea64a2d2bcc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeBusinessUnitsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeBusinessUnitsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeBusinessUnitsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -132,7 +125,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/me/business-units", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] {
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeCartsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeCartsByIDTest.java
index d37294edd8d..51904ddc284 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeCartsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeCartsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeCartsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/me/carts/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").me().carts().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeCartsReplicateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeCartsReplicateTest.java
index ae846dfdd9f..a7e3c36d146 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeCartsReplicateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeCartsReplicateTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeCartsReplicateTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
@@ -71,7 +64,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/me/carts/replicate", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeCartsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeCartsTest.java
index 693b45e338d..9dfcc63af56 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeCartsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeCartsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeCartsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").me().carts().get().withExpand("expand").createHttpRequest(),
@@ -119,7 +112,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/me/carts", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").me().carts().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeEmailConfirmTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeEmailConfirmTest.java
index 235122df423..0e466e536dd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeEmailConfirmTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeEmailConfirmTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeEmailConfirmTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/me/email/confirm", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeLoginTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeLoginTest.java
index 9c23f3e5641..b8095d2bf6d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeLoginTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeLoginTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeLoginTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/me/login", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeOrdersByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeOrdersByIDTest.java
index 2460691d788..d25d2a3d618 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeOrdersByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeOrdersByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeOrdersByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -85,7 +78,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "head", "test_projectKey/me/orders/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").me().orders().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeOrdersQuotesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeOrdersQuotesTest.java
index 18dec80695c..df4307d8f30 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeOrdersQuotesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeOrdersQuotesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeOrdersQuotesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
@@ -71,7 +64,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/me/orders/quotes", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeOrdersTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeOrdersTest.java
index 720aa62f169..0f6d1cd1d74 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeOrdersTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeOrdersTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeOrdersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").me().orders().get().withExpand("expand").createHttpRequest(),
@@ -119,7 +112,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/me/orders", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").me().orders().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePasswordResetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePasswordResetTest.java
index 3755e93ec47..6c7a0da957f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePasswordResetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePasswordResetTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMePasswordResetTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
@@ -71,7 +64,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/me/password/reset", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePasswordTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePasswordTest.java
index d2a54bc8e2b..2d43fcf31a6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePasswordTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePasswordTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMePasswordTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/me/password", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePaymentsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePaymentsByIDTest.java
index 196e9c5c551..dfb9376cde0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePaymentsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePaymentsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMePaymentsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/me/payments/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePaymentsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePaymentsTest.java
index 2a2e5d25fe8..91e1152f647 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePaymentsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMePaymentsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMePaymentsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -129,7 +122,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/me/payments", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").me().payments().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuoteRequestsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuoteRequestsByIDTest.java
index 5ef7cacae9e..bd099db2e44 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuoteRequestsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuoteRequestsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeQuoteRequestsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -102,7 +95,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/me/quote-requests/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuoteRequestsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuoteRequestsKeyByKeyTest.java
index 1153684f121..6ca0c1ca5fd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuoteRequestsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuoteRequestsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeQuoteRequestsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -102,7 +95,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/me/quote-requests/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuoteRequestsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuoteRequestsTest.java
index 0e365dc919c..23ec1c52be1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuoteRequestsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuoteRequestsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeQuoteRequestsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -132,7 +125,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/me/quote-requests", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] {
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuotesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuotesByIDTest.java
index 8216e0a568e..09490464ac6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuotesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuotesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeQuotesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -98,7 +91,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/me/quotes/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").me().quotes().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuotesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuotesKeyByKeyTest.java
index dd8030a7d16..29ab1d94fa2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuotesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuotesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeQuotesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -98,7 +91,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/me/quotes/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuotesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuotesTest.java
index e367e763b62..e21b35e8acb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuotesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeQuotesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeQuotesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").me().quotes().get().withExpand("expand").createHttpRequest(),
@@ -108,7 +101,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/me/quotes", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").me().quotes().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeShoppingListsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeShoppingListsByIDTest.java
index 9f030317b26..800f15e5b2e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeShoppingListsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeShoppingListsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeShoppingListsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -126,7 +119,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/me/shopping-lists/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeShoppingListsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeShoppingListsKeyByKeyTest.java
index 0ea40074ec4..c97fd87e82f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeShoppingListsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeShoppingListsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeShoppingListsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -126,7 +119,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/me/shopping-lists/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeShoppingListsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeShoppingListsTest.java
index 3da30cd7fb0..3a34f8755ba 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeShoppingListsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeShoppingListsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeShoppingListsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -132,7 +125,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/me/shopping-lists", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] {
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeSignupTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeSignupTest.java
index c653d06dac8..ab7405b7561 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeSignupTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeSignupTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeSignupTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/me/signup", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .me()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeTest.java
index bb65050ee3a..d8185401971 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMeTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMeTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -98,7 +91,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/me", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey").me().get().withSort("sort"), },
                 new Object[] { apiRoot.withProjectKey("test_projectKey").me().get().withLimit(7), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMessagesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMessagesByIDTest.java
index a480605b0f3..2c59dd9efba 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMessagesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMessagesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMessagesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -82,7 +75,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "head", "test_projectKey/messages/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").messages().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMessagesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMessagesTest.java
index 96b4d84155b..f71aa0f154a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMessagesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyMessagesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyMessagesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").messages().get().withExpand("expand").createHttpRequest(),
@@ -101,7 +94,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey/messages", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").messages().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersByIDTest.java
index 64eb6dc0082..2e2a5e0952b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/orders/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").orders().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsByIDApplyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsByIDApplyTest.java
index 1d4977c6bd2..9b3eeb98a7c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsByIDApplyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsByIDApplyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersEditsByIDApplyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .orders()
@@ -72,7 +65,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/orders/edits/test_ID/apply", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .orders()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsByIDTest.java
index 3b8b31131d2..f35b67672fb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersEditsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/orders/edits/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsKeyByKeyTest.java
index 66812253f5f..6705a8e3ffd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersEditsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -126,7 +119,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/orders/edits/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsTest.java
index 30b6b5ecc70..5456da5a1ac 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersEditsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersEditsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -129,7 +122,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/orders/edits", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").orders().edits().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersImportTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersImportTest.java
index 0569a57502e..b8a05db1d4f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersImportTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersImportTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersImportTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .orders()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/orders/import", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .orders()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersOrderNumberByOrderNumberTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersOrderNumberByOrderNumberTest.java
index ada7d96a9d9..c05bdb09064 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersOrderNumberByOrderNumberTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersOrderNumberByOrderNumberTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersOrderNumberByOrderNumberTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -128,7 +121,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/orders/order-number=test_orderNumber", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersQuotesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersQuotesTest.java
index fe28fc96b11..ed7098d9aca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersQuotesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersQuotesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersQuotesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .orders()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/orders/quotes", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .orders()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersSearchTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersSearchTest.java
index 88f032f2e8b..da5a4e066b5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersSearchTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersSearchTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersSearchTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/orders/search", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersTest.java
index 04f875b105b..d978885102c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyOrdersTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").orders().get().withExpand("expand").createHttpRequest(),
@@ -108,7 +101,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/orders", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").orders().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyPaymentsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyPaymentsByIDTest.java
index 64553b6df79..8b57f79128e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyPaymentsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyPaymentsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyPaymentsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -116,7 +109,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/payments/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").payments().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyPaymentsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyPaymentsKeyByKeyTest.java
index 0f427937380..f4cc4e0ff66 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyPaymentsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyPaymentsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyPaymentsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -120,7 +113,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/payments/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").payments().withKey("test_key").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyPaymentsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyPaymentsTest.java
index da4f33fcaa2..0a3c99f7c81 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyPaymentsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyPaymentsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyPaymentsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").payments().get().withExpand("expand").createHttpRequest(),
@@ -110,7 +103,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/payments", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").payments().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsByIDTest.java
index d9cf2bff260..4991e003234 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductDiscountsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/product-discounts/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsKeyByKeyTest.java
index bb1f27d4e9c..db138f1108b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductDiscountsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/product-discounts/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsMatchingTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsMatchingTest.java
index 5cb836b2dee..5a0bce06ac2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsMatchingTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsMatchingTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductDiscountsMatchingTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .productDiscounts()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/product-discounts/matching", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .productDiscounts()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsTest.java
index 4191b2324eb..be7f7c101ce 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductDiscountsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductDiscountsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/product-discounts", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] {
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsByIDTest.java
index 49f426d6b60..cb9678a14bd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductProjectionsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -149,7 +142,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "head", "test_projectKey/product-projections/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsKeyByKeyTest.java
index 237ab80bd28..1a69ac3a56f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductProjectionsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -150,7 +143,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "head", "test_projectKey/product-projections/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsSearchTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsSearchTest.java
index 34ac21bad7e..ea6f264db3a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsSearchTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsSearchTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductProjectionsSearchTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").productProjections().search().post(null).createHttpRequest(),
@@ -226,7 +219,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "get", "test_projectKey/product-projections/search", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").productProjections().search().post(null), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsSuggestTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsSuggestTest.java
index fc00f34d4d8..379b59f003c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsSuggestTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsSuggestTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductProjectionsSuggestTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -102,7 +95,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "get", "test_projectKey/product-projections/suggest", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsTest.java
index 5eff5e92428..4474782746f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductProjectionsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductProjectionsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -168,7 +161,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/product-projections", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").productProjections().get().withStaged(true), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsByIDProductsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsByIDProductsTest.java
index 66f1769b65d..29cace1dc2a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsByIDProductsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsByIDProductsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductSelectionsByIDProductsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -126,7 +119,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "get", "test_projectKey/product-selections/test_ID/products", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsByIDTest.java
index fe6bb8cc4a9..c074546a9b8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductSelectionsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/product-selections/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsKeyByKeyProductsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsKeyByKeyProductsTest.java
index 54f5a64753a..0c1301aef43 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsKeyByKeyProductsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsKeyByKeyProductsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductSelectionsKeyByKeyProductsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -128,7 +121,6 @@ public static Object[][] requestWithMethodParameters() {
                         "get", "test_projectKey/product-selections/key=test_key/products", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsKeyByKeyTest.java
index 2468e001657..4cd870cdfba 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductSelectionsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/product-selections/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsTest.java
index 1539ba09285..533a44f827c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductSelectionsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductSelectionsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/product-selections", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] {
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTailoringByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTailoringByIDTest.java
index 7d99c772dd1..f088c606e37 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTailoringByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTailoringByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductTailoringByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -113,7 +106,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/product-tailoring/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTailoringKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTailoringKeyByKeyTest.java
index 1aa2285bdbc..1aa6dfc6671 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTailoringKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTailoringKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductTailoringKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -113,7 +106,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/product-tailoring/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTailoringTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTailoringTest.java
index 6a7b32c4527..148f33bd67e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTailoringTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTailoringTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductTailoringTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/product-tailoring", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] {
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTypesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTypesByIDTest.java
index 089bd00e705..946d8d0bc72 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTypesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTypesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductTypesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/product-types/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTypesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTypesKeyByKeyTest.java
index dc562e2f5fc..00adebe9963 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTypesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTypesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductTypesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/product-types/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTypesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTypesTest.java
index ab62f7ca714..b318b2a17f5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTypesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductTypesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductTypesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").productTypes().get().withExpand("expand").createHttpRequest(),
@@ -114,7 +107,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/product-types", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").productTypes().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsByIDImagesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsByIDImagesTest.java
index 354493dd5b4..cf39377b9cd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsByIDImagesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsByIDImagesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductsByIDImagesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -102,7 +95,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/products/test_ID/images", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsByIDProductSelectionsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsByIDProductSelectionsTest.java
index 54a76b9cd1a..96d75a09980 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsByIDProductSelectionsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsByIDProductSelectionsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductsByIDProductSelectionsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -135,7 +128,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "get", "test_projectKey/products/test_ID/product-selections", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsByIDTest.java
index 9bfe8db7304..890921efcf5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -233,7 +226,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/products/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsKeyByKeyProductSelectionsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsKeyByKeyProductSelectionsTest.java
index 402e6ae65d9..3b1febd1ce7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsKeyByKeyProductSelectionsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsKeyByKeyProductSelectionsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductsKeyByKeyProductSelectionsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -137,7 +130,6 @@ public static Object[][] requestWithMethodParameters() {
                         "get", "test_projectKey/products/key=test_key/product-selections", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsKeyByKeyTest.java
index 889b7adeb16..7b5629c1aa2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -235,7 +228,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/products/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsSearchTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsSearchTest.java
index 0e0169693cc..1951e7efd8a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsSearchTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsSearchTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductsSearchTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .products()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/products/search", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .products()
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsTest.java
index 42cdfd91f6b..005c26aa2f7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyProductsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").products().get().withWhere("where").createHttpRequest(),
@@ -170,7 +163,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/products", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").products().get().withWhere("where"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuoteRequestsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuoteRequestsByIDTest.java
index 9e9c1f3ffc7..dbd0e068bbf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuoteRequestsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuoteRequestsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyQuoteRequestsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -120,7 +113,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/quote-requests/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuoteRequestsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuoteRequestsKeyByKeyTest.java
index 90eab32f79e..aecedbdad86 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuoteRequestsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuoteRequestsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyQuoteRequestsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -126,7 +119,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/quote-requests/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuoteRequestsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuoteRequestsTest.java
index 533215ab395..fadd7980792 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuoteRequestsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuoteRequestsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyQuoteRequestsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/quote-requests", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").quoteRequests().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuotesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuotesByIDTest.java
index 27a6ab0622d..577157f222c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuotesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuotesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyQuotesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/quotes/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").quotes().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuotesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuotesKeyByKeyTest.java
index 284c5194993..ba91786efef 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuotesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuotesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyQuotesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/quotes/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").quotes().withKey("test_key").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuotesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuotesTest.java
index 88f54891d9b..083ac4c09ef 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuotesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyQuotesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyQuotesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").quotes().get().withExpand("expand").createHttpRequest(),
@@ -108,7 +101,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/quotes", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").quotes().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyReviewsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyReviewsByIDTest.java
index e71285798bb..c920119f239 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyReviewsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyReviewsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyReviewsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -114,7 +107,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/reviews/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").reviews().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyReviewsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyReviewsKeyByKeyTest.java
index 3afa17dc8ad..0677ac5785b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyReviewsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyReviewsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyReviewsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/reviews/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").reviews().withKey("test_key").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyReviewsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyReviewsTest.java
index 8591b1d9994..619ebd97162 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyReviewsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyReviewsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyReviewsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").reviews().get().withExpand("expand").createHttpRequest(),
@@ -110,7 +103,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/reviews", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").reviews().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsByIDTest.java
index f149eda37ab..bf80f47e75c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyShippingMethodsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -116,7 +109,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/shipping-methods/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsKeyByKeyTest.java
index 798a1c4f78c..f139b1a6f68 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyShippingMethodsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/shipping-methods/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingCartLocationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingCartLocationTest.java
index eb3fdcd8437..199f75781b1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingCartLocationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingCartLocationTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyShippingMethodsMatchingCartLocationTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -136,7 +129,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/shipping-methods/matching-cart-location", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingCartTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingCartTest.java
index 84b801fef67..a027ab2cded 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingCartTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingCartTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyShippingMethodsMatchingCartTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -100,7 +93,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "head", "test_projectKey/shipping-methods/matching-cart", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingLocationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingLocationTest.java
index 7bb1cddb920..943f75f38f2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingLocationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingLocationTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyShippingMethodsMatchingLocationTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -140,7 +133,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "head", "test_projectKey/shipping-methods/matching-location", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingOrdereditTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingOrdereditTest.java
index 29c00e2c1d0..87441dcd6d4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingOrdereditTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsMatchingOrdereditTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyShippingMethodsMatchingOrdereditTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -126,7 +119,6 @@ public static Object[][] requestWithMethodParameters() {
                         "head", "test_projectKey/shipping-methods/matching-orderedit", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsTest.java
index 2b3e5aec978..0043796933a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShippingMethodsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyShippingMethodsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/shipping-methods", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] {
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShoppingListsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShoppingListsByIDTest.java
index 5e52ffaf503..1c08caaa0f2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShoppingListsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShoppingListsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyShoppingListsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -120,7 +113,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/shopping-lists/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShoppingListsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShoppingListsKeyByKeyTest.java
index b560c0bfe21..8f8f646d9ce 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShoppingListsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShoppingListsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyShoppingListsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -126,7 +119,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/shopping-lists/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShoppingListsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShoppingListsTest.java
index 67010abccb4..239be40bcdc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShoppingListsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyShoppingListsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyShoppingListsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/shopping-lists", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").shoppingLists().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStagedQuotesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStagedQuotesByIDTest.java
index caa88dde447..bca3c37323d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStagedQuotesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStagedQuotesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStagedQuotesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -120,7 +113,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/staged-quotes/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStagedQuotesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStagedQuotesKeyByKeyTest.java
index 895fde49dae..8c6bf2ff812 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStagedQuotesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStagedQuotesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStagedQuotesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -126,7 +119,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/staged-quotes/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStagedQuotesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStagedQuotesTest.java
index 425fe22ad25..5b047dc668b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStagedQuotesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStagedQuotesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStagedQuotesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").stagedQuotes().get().withExpand("expand").createHttpRequest(),
@@ -114,7 +107,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/staged-quotes", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").stagedQuotes().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStandalonePricesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStandalonePricesByIDTest.java
index 3e8220fbf3c..5ce951afbdf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStandalonePricesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStandalonePricesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStandalonePricesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/standalone-prices/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStandalonePricesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStandalonePricesKeyByKeyTest.java
index 3a2b9114410..919b29775f2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStandalonePricesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStandalonePricesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStandalonePricesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/standalone-prices/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStandalonePricesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStandalonePricesTest.java
index b71f0efd2d6..5f1ad00fa3f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStandalonePricesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStandalonePricesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStandalonePricesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/standalone-prices", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] {
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStatesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStatesByIDTest.java
index 64792d9a426..e62ca960490 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStatesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStatesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStatesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -106,7 +99,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/states/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").states().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStatesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStatesKeyByKeyTest.java
index 58e1a444695..bcf692be5ad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStatesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStatesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStatesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -110,7 +103,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/states/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").states().withKey("test_key").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStatesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStatesTest.java
index c00ee7abb64..94e79a2f391 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStatesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStatesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStatesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").states().get().withExpand("expand").createHttpRequest(),
@@ -108,7 +101,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/states", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").states().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStoresByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStoresByIDTest.java
index bd67577ac9e..5c9cad16637 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStoresByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStoresByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStoresByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -106,7 +99,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/stores/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").stores().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStoresKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStoresKeyByKeyTest.java
index 7a743de0741..30ab5ff5012 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStoresKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStoresKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStoresKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -110,7 +103,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/stores/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").stores().withKey("test_key").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStoresTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStoresTest.java
index d7fa5e69e5c..415bfe109b8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStoresTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyStoresTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStoresTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").stores().get().withExpand("expand").createHttpRequest(),
@@ -108,7 +101,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/stores", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").stores().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsByIDHealthTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsByIDHealthTest.java
index d88fafc3b2d..513900cdee3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsByIDHealthTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsByIDHealthTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeySubscriptionsByIDHealthTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey")
                 .subscriptions()
@@ -71,7 +64,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "get", "test_projectKey/subscriptions/test_ID/health", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").subscriptions().withId("test_ID").withIdHealth().get(), } };
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsByIDTest.java
index 241f19ed786..a368ee6e25c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeySubscriptionsByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").subscriptions().withId("test_ID").get().createHttpRequest(),
@@ -89,7 +82,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/subscriptions/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").subscriptions().withId("test_ID").get(), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsKeyByKeyTest.java
index b2bd13dfe39..c9307c1cf91 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeySubscriptionsKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").subscriptions().withKey("test_key").get().createHttpRequest(),
@@ -91,7 +84,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/subscriptions/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").subscriptions().withKey("test_key").get(), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsTest.java
index bb22f8912a8..f4124f92ee7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeySubscriptionsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeySubscriptionsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").subscriptions().get().withSort("sort").createHttpRequest(),
@@ -106,7 +99,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/subscriptions", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").subscriptions().get().withSort("sort"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTaxCategoriesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTaxCategoriesByIDTest.java
index c003379e84d..c1c5a057431 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTaxCategoriesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTaxCategoriesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyTaxCategoriesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -112,7 +105,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/tax-categories/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTaxCategoriesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTaxCategoriesKeyByKeyTest.java
index 25b7d0cd904..1fdab5855fa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTaxCategoriesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTaxCategoriesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyTaxCategoriesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -118,7 +111,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/tax-categories/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTaxCategoriesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTaxCategoriesTest.java
index 11d4e51d017..5634c596b75 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTaxCategoriesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTaxCategoriesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyTaxCategoriesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -121,7 +114,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/tax-categories", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").taxCategories().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTest.java
index eafbbf53459..ed419d595db 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").get().createHttpRequest(), "get",
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKey("test_projectKey").get(), },
                 new Object[] { apiRoot.withProjectKey("test_projectKey").head(), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTypesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTypesByIDTest.java
index d139f98e2ac..6950e53f1bc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTypesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTypesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyTypesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -106,7 +99,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/types/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").types().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTypesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTypesKeyByKeyTest.java
index b9694a10bb5..aff4f5335fe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTypesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTypesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyTypesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -108,7 +101,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/types/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").types().withKey("test_key").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTypesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTypesTest.java
index 5387a0097e9..5f7f64f8a1c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTypesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyTypesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyTypesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").types().get().withExpand("expand").createHttpRequest(), "get",
@@ -103,7 +96,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/types", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").types().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyZonesByIDTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyZonesByIDTest.java
index 2457fcf59c8..999150a8997 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyZonesByIDTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyZonesByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyZonesByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -106,7 +99,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/zones/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").zones().withId("test_ID").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyZonesKeyByKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyZonesKeyByKeyTest.java
index b4b7116d399..b8497b64360 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyZonesKeyByKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyZonesKeyByKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyZonesKeyByKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey")
@@ -108,7 +101,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "delete", "test_projectKey/zones/key=test_key", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").zones().withKey("test_key").get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyZonesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyZonesTest.java
index dc97384f1a7..7e013e6bc34 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyZonesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/client/resource/ByProjectKeyZonesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.api.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyZonesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKey("test_projectKey").zones().get().withExpand("expand").createHttpRequest(), "get",
@@ -103,7 +96,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "post", "test_projectKey/zones", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKey("test_projectKey").zones().get().withExpand("expand"), },
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/api_client/ApiClientDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/api_client/ApiClientDraftTest.java
index 963bb81f486..eb63039e67e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/api_client/ApiClientDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/api_client/ApiClientDraftTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.api_client;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApiClientDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApiClientDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApiClientDraftBuilder builder) {
         ApiClientDraft apiClientDraft = builder.buildUnchecked();
         Assertions.assertThat(apiClientDraft).isInstanceOf(ApiClientDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApiClientDraft.builder().name("name") },
-                new Object[] { ApiClientDraft.builder().scope("scope") },
-                new Object[] { ApiClientDraft.builder().deleteDaysAfterCreation(4L) },
-                new Object[] { ApiClientDraft.builder().accessTokenValiditySeconds(8) },
-                new Object[] { ApiClientDraft.builder().refreshTokenValiditySeconds(7) } };
+        return new Object[][] { new Object[] { "name", ApiClientDraft.builder().name("name") },
+                new Object[] { "scope", ApiClientDraft.builder().scope("scope") },
+                new Object[] { "deleteDaysAfterCreation", ApiClientDraft.builder().deleteDaysAfterCreation(4L) },
+                new Object[] { "accessTokenValiditySeconds", ApiClientDraft.builder().accessTokenValiditySeconds(8) },
+                new Object[] { "refreshTokenValiditySeconds",
+                        ApiClientDraft.builder().refreshTokenValiditySeconds(7) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/api_client/ApiClientPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/api_client/ApiClientPagedQueryResponseTest.java
index 513abe91ccc..1f7a3ee3b76 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/api_client/ApiClientPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/api_client/ApiClientPagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApiClientPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApiClientPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApiClientPagedQueryResponseBuilder builder) {
         ApiClientPagedQueryResponse apiClientPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(apiClientPagedQueryResponse).isInstanceOf(ApiClientPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApiClientPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ApiClientPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ApiClientPagedQueryResponse.builder().count(2L) },
-                new Object[] { ApiClientPagedQueryResponse.builder().total(1L) },
-                new Object[] { ApiClientPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", ApiClientPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ApiClientPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ApiClientPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ApiClientPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", ApiClientPagedQueryResponse.builder()
                         .results(
                             Collections.singletonList(new com.commercetools.api.models.api_client.ApiClientImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/api_client/ApiClientTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/api_client/ApiClientTest.java
index 86eb75e70ba..367f7d1f956 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/api_client/ApiClientTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/api_client/ApiClientTest.java
@@ -4,37 +4,30 @@
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApiClientTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApiClientBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApiClientBuilder builder) {
         ApiClient apiClient = builder.buildUnchecked();
         Assertions.assertThat(apiClient).isInstanceOf(ApiClient.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApiClient.builder().id("id") },
-                new Object[] { ApiClient.builder().name("name") }, new Object[] { ApiClient.builder().scope("scope") },
-                new Object[] { ApiClient.builder().secret("secret") },
-                new Object[] { ApiClient.builder().lastUsedAt(LocalDate.parse("2023-06-01")) },
-                new Object[] { ApiClient.builder().deleteAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ApiClient.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ApiClient.builder().accessTokenValiditySeconds(8) },
-                new Object[] { ApiClient.builder().refreshTokenValiditySeconds(7) } };
+        return new Object[][] { new Object[] { "id", ApiClient.builder().id("id") },
+                new Object[] { "name", ApiClient.builder().name("name") },
+                new Object[] { "scope", ApiClient.builder().scope("scope") },
+                new Object[] { "secret", ApiClient.builder().secret("secret") },
+                new Object[] { "lastUsedAt", ApiClient.builder().lastUsedAt(LocalDate.parse("2023-06-01")) },
+                new Object[] { "deleteAt", ApiClient.builder().deleteAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "createdAt", ApiClient.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "accessTokenValiditySeconds", ApiClient.builder().accessTokenValiditySeconds(8) },
+                new Object[] { "refreshTokenValiditySeconds", ApiClient.builder().refreshTokenValiditySeconds(7) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowApprovalTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowApprovalTest.java
index 99d36291a7e..453de7a6431 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowApprovalTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowApprovalTest.java
@@ -3,33 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowApprovalTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowApprovalBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowApprovalBuilder builder) {
         ApprovalFlowApproval approvalFlowApproval = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowApproval).isInstanceOf(ApprovalFlowApproval.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalFlowApproval.builder()
-                        .approver(new com.commercetools.api.models.business_unit.AssociateImpl()) },
-                new Object[] { ApprovalFlowApproval.builder().approvedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "approver",
+                        ApprovalFlowApproval.builder()
+                                .approver(new com.commercetools.api.models.business_unit.AssociateImpl()) },
+                new Object[] { "approvedAt",
+                        ApprovalFlowApproval.builder().approvedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowApproveActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowApproveActionTest.java
index f12ed5745e4..9194960b9e7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowApproveActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowApproveActionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.approval_flow;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowApproveActionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowPagedQueryResponseTest.java
index f57ee11a6c4..32b71a8177a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowPagedQueryResponseBuilder builder) {
         ApprovalFlowPagedQueryResponse approvalFlowPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowPagedQueryResponse).isInstanceOf(ApprovalFlowPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalFlowPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ApprovalFlowPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ApprovalFlowPagedQueryResponse.builder().count(2L) },
-                new Object[] { ApprovalFlowPagedQueryResponse.builder().total(1L) },
-                new Object[] { ApprovalFlowPagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.approval_flow.ApprovalFlowImpl())) } };
+        return new Object[][] { new Object[] { "limit", ApprovalFlowPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ApprovalFlowPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ApprovalFlowPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ApprovalFlowPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        ApprovalFlowPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_flow.ApprovalFlowImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowRejectActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowRejectActionTest.java
index 83083dea32e..fb64b4cdb7c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowRejectActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowRejectActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.approval_flow;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowRejectActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowRejectActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowRejectActionBuilder builder) {
         ApprovalFlowRejectAction approvalFlowRejectAction = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowRejectAction).isInstanceOf(ApprovalFlowRejectAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalFlowRejectAction.builder().reason("reason") } };
+        return new Object[][] { new Object[] { "reason", ApprovalFlowRejectAction.builder().reason("reason") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowRejectionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowRejectionTest.java
index 8b7f3fb5146..5d3ecd264fa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowRejectionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowRejectionTest.java
@@ -3,34 +3,28 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowRejectionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowRejectionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowRejectionBuilder builder) {
         ApprovalFlowRejection approvalFlowRejection = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowRejection).isInstanceOf(ApprovalFlowRejection.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalFlowRejection.builder()
-                        .rejecter(new com.commercetools.api.models.business_unit.AssociateImpl()) },
-                new Object[] { ApprovalFlowRejection.builder().rejectedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ApprovalFlowRejection.builder().reason("reason") } };
+                new Object[] { "rejecter",
+                        ApprovalFlowRejection.builder()
+                                .rejecter(new com.commercetools.api.models.business_unit.AssociateImpl()) },
+                new Object[] { "rejectedAt",
+                        ApprovalFlowRejection.builder().rejectedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "reason", ApprovalFlowRejection.builder().reason("reason") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowSetCustomFieldActionTest.java
index 7b1878f58ca..70a332953d2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.approval_flow;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowSetCustomFieldActionBuilder builder) {
         ApprovalFlowSetCustomFieldAction approvalFlowSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowSetCustomFieldAction).isInstanceOf(ApprovalFlowSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalFlowSetCustomFieldAction.builder().name("name") },
-                new Object[] { ApprovalFlowSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", ApprovalFlowSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ApprovalFlowSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowSetCustomTypeActionTest.java
index 383095c6f84..d6e80c0813f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.approval_flow;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowSetCustomTypeActionBuilder builder) {
         ApprovalFlowSetCustomTypeAction approvalFlowSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowSetCustomTypeAction).isInstanceOf(ApprovalFlowSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalFlowSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ApprovalFlowSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        ApprovalFlowSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ApprovalFlowSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowTest.java
index 30e5ec72268..ccb50f96a10 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowTest.java
@@ -4,61 +4,63 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowBuilder builder) {
         ApprovalFlow approvalFlow = builder.buildUnchecked();
         Assertions.assertThat(approvalFlow).isInstanceOf(ApprovalFlow.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalFlow.builder().id("id") },
-                new Object[] { ApprovalFlow.builder().version(2L) },
-                new Object[] { ApprovalFlow.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", ApprovalFlow.builder().id("id") },
+                new Object[] { "version", ApprovalFlow.builder().version(2L) },
+                new Object[] { "createdAt",
+                        ApprovalFlow.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "createdBy",
                         ApprovalFlow.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { ApprovalFlow.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ApprovalFlow.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+                new Object[] { "lastModifiedAt",
+                        ApprovalFlow.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        ApprovalFlow.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "order",
                         ApprovalFlow.builder().order(new com.commercetools.api.models.order.OrderReferenceImpl()) },
-                new Object[] { ApprovalFlow.builder()
+                new Object[] { "businessUnit", ApprovalFlow.builder()
                         .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { ApprovalFlow.builder()
-                        .rules(Collections
-                                .singletonList(new com.commercetools.api.models.approval_rule.ApprovalRuleImpl())) },
-                new Object[] { ApprovalFlow.builder()
-                        .status(com.commercetools.api.models.approval_flow.ApprovalFlowStatus.findEnum("Pending")) },
-                new Object[] { ApprovalFlow.builder()
+                new Object[] { "rules",
+                        ApprovalFlow.builder()
+                                .rules(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_rule.ApprovalRuleImpl())) },
+                new Object[] { "status",
+                        ApprovalFlow.builder()
+                                .status(com.commercetools.api.models.approval_flow.ApprovalFlowStatus
+                                        .findEnum("Pending")) },
+                new Object[] { "rejection", ApprovalFlow.builder()
                         .rejection(new com.commercetools.api.models.approval_flow.ApprovalFlowRejectionImpl()) },
-                new Object[] { ApprovalFlow.builder()
-                        .approvals(Collections.singletonList(
-                            new com.commercetools.api.models.approval_flow.ApprovalFlowApprovalImpl())) },
-                new Object[] { ApprovalFlow.builder()
-                        .eligibleApprovers(Collections
-                                .singletonList(new com.commercetools.api.models.approval_rule.RuleApproverImpl())) },
-                new Object[] { ApprovalFlow.builder()
-                        .pendingApprovers(Collections
-                                .singletonList(new com.commercetools.api.models.approval_rule.RuleApproverImpl())) },
-                new Object[] { ApprovalFlow.builder()
-                        .currentTierPendingApprovers(Collections
-                                .singletonList(new com.commercetools.api.models.approval_rule.RuleApproverImpl())) },
-                new Object[] {
+                new Object[] { "approvals",
+                        ApprovalFlow.builder()
+                                .approvals(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_flow.ApprovalFlowApprovalImpl())) },
+                new Object[] { "eligibleApprovers",
+                        ApprovalFlow.builder()
+                                .eligibleApprovers(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_rule.RuleApproverImpl())) },
+                new Object[] { "pendingApprovers",
+                        ApprovalFlow.builder()
+                                .pendingApprovers(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_rule.RuleApproverImpl())) },
+                new Object[] { "currentTierPendingApprovers",
+                        ApprovalFlow.builder()
+                                .currentTierPendingApprovers(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_rule.RuleApproverImpl())) },
+                new Object[] { "custom",
                         ApprovalFlow.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowUpdateTest.java
index 19479b9e96b..6767abd323d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_flow/ApprovalFlowUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowUpdateBuilder builder) {
         ApprovalFlowUpdate approvalFlowUpdate = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowUpdate).isInstanceOf(ApprovalFlowUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalFlowUpdate.builder().version(2L) },
-                new Object[] { ApprovalFlowUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.approval_flow.ApprovalFlowUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", ApprovalFlowUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        ApprovalFlowUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_flow.ApprovalFlowUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleDraftTest.java
index 28ac96cb76e..57c8effa8ec 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleDraftTest.java
@@ -3,40 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleDraftBuilder builder) {
         ApprovalRuleDraft approvalRuleDraft = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleDraft).isInstanceOf(ApprovalRuleDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleDraft.builder().key("key") },
-                new Object[] { ApprovalRuleDraft.builder().name("name") },
-                new Object[] { ApprovalRuleDraft.builder().description("description") },
-                new Object[] { ApprovalRuleDraft.builder()
+        return new Object[][] { new Object[] { "key", ApprovalRuleDraft.builder().key("key") },
+                new Object[] { "name", ApprovalRuleDraft.builder().name("name") },
+                new Object[] { "description", ApprovalRuleDraft.builder().description("description") },
+                new Object[] { "status", ApprovalRuleDraft.builder()
                         .status(com.commercetools.api.models.approval_rule.ApprovalRuleStatus.findEnum("Active")) },
-                new Object[] { ApprovalRuleDraft.builder().predicate("predicate") },
-                new Object[] { ApprovalRuleDraft.builder()
+                new Object[] { "predicate", ApprovalRuleDraft.builder().predicate("predicate") },
+                new Object[] { "approvers", ApprovalRuleDraft.builder()
                         .approvers(new com.commercetools.api.models.approval_rule.ApproverHierarchyDraftImpl()) },
-                new Object[] { ApprovalRuleDraft.builder()
-                        .requesters(Collections.singletonList(
-                            new com.commercetools.api.models.approval_rule.RuleRequesterDraftImpl())) } };
+                new Object[] { "requesters",
+                        ApprovalRuleDraft.builder()
+                                .requesters(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_rule.RuleRequesterDraftImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRulePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRulePagedQueryResponseTest.java
index 1e3c265963b..d6c22b92ffd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRulePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRulePagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRulePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRulePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRulePagedQueryResponseBuilder builder) {
         ApprovalRulePagedQueryResponse approvalRulePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(approvalRulePagedQueryResponse).isInstanceOf(ApprovalRulePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRulePagedQueryResponse.builder().limit(7L) },
-                new Object[] { ApprovalRulePagedQueryResponse.builder().offset(3L) },
-                new Object[] { ApprovalRulePagedQueryResponse.builder().count(2L) },
-                new Object[] { ApprovalRulePagedQueryResponse.builder().total(1L) },
-                new Object[] { ApprovalRulePagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.approval_rule.ApprovalRuleImpl())) } };
+        return new Object[][] { new Object[] { "limit", ApprovalRulePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ApprovalRulePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ApprovalRulePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ApprovalRulePagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        ApprovalRulePagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_rule.ApprovalRuleImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetApproversActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetApproversActionTest.java
index c967ccfde2b..7205732b28b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetApproversActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetApproversActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.approval_rule;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleSetApproversActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleSetApproversActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleSetApproversActionBuilder builder) {
         ApprovalRuleSetApproversAction approvalRuleSetApproversAction = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleSetApproversAction).isInstanceOf(ApprovalRuleSetApproversAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleSetApproversAction.builder()
+        return new Object[][] { new Object[] { "approvers", ApprovalRuleSetApproversAction.builder()
                 .approvers(new com.commercetools.api.models.approval_rule.ApproverHierarchyDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetCustomFieldActionTest.java
index 456a87e1f57..a990decf5ae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.approval_rule;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleSetCustomFieldActionBuilder builder) {
         ApprovalRuleSetCustomFieldAction approvalRuleSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleSetCustomFieldAction).isInstanceOf(ApprovalRuleSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleSetCustomFieldAction.builder().name("name") },
-                new Object[] { ApprovalRuleSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", ApprovalRuleSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ApprovalRuleSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetCustomTypeActionTest.java
index 460c6326b9c..178c061b00b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.approval_rule;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleSetCustomTypeActionBuilder builder) {
         ApprovalRuleSetCustomTypeAction approvalRuleSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleSetCustomTypeAction).isInstanceOf(ApprovalRuleSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalRuleSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ApprovalRuleSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        ApprovalRuleSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ApprovalRuleSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetDescriptionActionTest.java
index a076e150ec9..a6d5533ebc5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetDescriptionActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.approval_rule;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleSetDescriptionActionBuilder builder) {
         ApprovalRuleSetDescriptionAction approvalRuleSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleSetDescriptionAction).isInstanceOf(ApprovalRuleSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalRuleSetDescriptionAction.builder().description("description") } };
+                new Object[] { "description", ApprovalRuleSetDescriptionAction.builder().description("description") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetKeyActionTest.java
index 9df14d00eb2..ce5c8a27a60 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.approval_rule;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleSetKeyActionBuilder builder) {
         ApprovalRuleSetKeyAction approvalRuleSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleSetKeyAction).isInstanceOf(ApprovalRuleSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ApprovalRuleSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetNameActionTest.java
index 167cccf39a8..09fb569d0e5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.approval_rule;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleSetNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleSetNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleSetNameActionBuilder builder) {
         ApprovalRuleSetNameAction approvalRuleSetNameAction = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleSetNameAction).isInstanceOf(ApprovalRuleSetNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleSetNameAction.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", ApprovalRuleSetNameAction.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetPredicateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetPredicateActionTest.java
index e256fe3eabc..9f03e0b01a8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetPredicateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetPredicateActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.approval_rule;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleSetPredicateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleSetPredicateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleSetPredicateActionBuilder builder) {
         ApprovalRuleSetPredicateAction approvalRuleSetPredicateAction = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleSetPredicateAction).isInstanceOf(ApprovalRuleSetPredicateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleSetPredicateAction.builder().predicate("predicate") } };
+        return new Object[][] {
+                new Object[] { "predicate", ApprovalRuleSetPredicateAction.builder().predicate("predicate") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetRequestersActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetRequestersActionTest.java
index 635fce442b2..5988198baa3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetRequestersActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetRequestersActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleSetRequestersActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleSetRequestersActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleSetRequestersActionBuilder builder) {
         ApprovalRuleSetRequestersAction approvalRuleSetRequestersAction = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleSetRequestersAction).isInstanceOf(ApprovalRuleSetRequestersAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleSetRequestersAction.builder()
-                .requesters(Collections
-                        .singletonList(new com.commercetools.api.models.approval_rule.RuleRequesterDraftImpl())) } };
+        return new Object[][] { new Object[] { "requesters",
+                ApprovalRuleSetRequestersAction.builder()
+                        .requesters(Collections.singletonList(
+                            new com.commercetools.api.models.approval_rule.RuleRequesterDraftImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetStatusActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetStatusActionTest.java
index 3b4cdd0b2a7..5898fc592dc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetStatusActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleSetStatusActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.approval_rule;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleSetStatusActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleSetStatusActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleSetStatusActionBuilder builder) {
         ApprovalRuleSetStatusAction approvalRuleSetStatusAction = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleSetStatusAction).isInstanceOf(ApprovalRuleSetStatusAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleSetStatusAction.builder()
+        return new Object[][] { new Object[] { "status", ApprovalRuleSetStatusAction.builder()
                 .status(com.commercetools.api.models.approval_rule.ApprovalRuleStatus.findEnum("Active")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleTest.java
index b0711ae23e8..ce1bd34b8da 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleTest.java
@@ -4,51 +4,48 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleBuilder builder) {
         ApprovalRule approvalRule = builder.buildUnchecked();
         Assertions.assertThat(approvalRule).isInstanceOf(ApprovalRule.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRule.builder().id("id") },
-                new Object[] { ApprovalRule.builder().version(2L) },
-                new Object[] { ApprovalRule.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", ApprovalRule.builder().id("id") },
+                new Object[] { "version", ApprovalRule.builder().version(2L) },
+                new Object[] { "createdAt",
+                        ApprovalRule.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "createdBy",
                         ApprovalRule.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { ApprovalRule.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ApprovalRule.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { ApprovalRule.builder().key("key") },
-                new Object[] { ApprovalRule.builder().name("name") },
-                new Object[] { ApprovalRule.builder().description("description") },
-                new Object[] { ApprovalRule.builder()
+                new Object[] { "lastModifiedAt",
+                        ApprovalRule.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        ApprovalRule.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "key", ApprovalRule.builder().key("key") },
+                new Object[] { "name", ApprovalRule.builder().name("name") },
+                new Object[] { "description", ApprovalRule.builder().description("description") },
+                new Object[] { "status", ApprovalRule.builder()
                         .status(com.commercetools.api.models.approval_rule.ApprovalRuleStatus.findEnum("Active")) },
-                new Object[] { ApprovalRule.builder().predicate("predicate") },
-                new Object[] { ApprovalRule.builder()
-                        .approvers(new com.commercetools.api.models.approval_rule.ApproverHierarchyImpl()) },
-                new Object[] { ApprovalRule.builder()
-                        .requesters(Collections
-                                .singletonList(new com.commercetools.api.models.approval_rule.RuleRequesterImpl())) },
-                new Object[] { ApprovalRule.builder()
+                new Object[] { "predicate", ApprovalRule.builder().predicate("predicate") },
+                new Object[] { "approvers",
+                        ApprovalRule.builder()
+                                .approvers(new com.commercetools.api.models.approval_rule.ApproverHierarchyImpl()) },
+                new Object[] { "requesters",
+                        ApprovalRule.builder()
+                                .requesters(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_rule.RuleRequesterImpl())) },
+                new Object[] { "businessUnit", ApprovalRule.builder()
                         .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] {
+                new Object[] { "custom",
                         ApprovalRule.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleUpdateTest.java
index 9e0ce7de4a8..fa35aed5ddd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApprovalRuleUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleUpdateBuilder builder) {
         ApprovalRuleUpdate approvalRuleUpdate = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleUpdate).isInstanceOf(ApprovalRuleUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleUpdate.builder().version(2L) },
-                new Object[] { ApprovalRuleUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.approval_rule.ApprovalRuleUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", ApprovalRuleUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        ApprovalRuleUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_rule.ApprovalRuleUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverConjunctionDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverConjunctionDraftTest.java
index fca71445517..dca0ed2b235 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverConjunctionDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverConjunctionDraftTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApproverConjunctionDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApproverConjunctionDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApproverConjunctionDraftBuilder builder) {
         ApproverConjunctionDraft approverConjunctionDraft = builder.buildUnchecked();
         Assertions.assertThat(approverConjunctionDraft).isInstanceOf(ApproverConjunctionDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApproverConjunctionDraft.builder()
-                .and(Collections.singletonList(
-                    new com.commercetools.api.models.approval_rule.ApproverDisjunctionDraftImpl())) } };
+        return new Object[][] { new Object[] { "and",
+                ApproverConjunctionDraft.builder()
+                        .and(Collections.singletonList(
+                            new com.commercetools.api.models.approval_rule.ApproverDisjunctionDraftImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverConjunctionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverConjunctionTest.java
index 3d3f1487db2..de275dc550d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverConjunctionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverConjunctionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApproverConjunctionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApproverConjunctionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApproverConjunctionBuilder builder) {
         ApproverConjunction approverConjunction = builder.buildUnchecked();
         Assertions.assertThat(approverConjunction).isInstanceOf(ApproverConjunction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApproverConjunction.builder()
-                .and(Collections
-                        .singletonList(new com.commercetools.api.models.approval_rule.ApproverDisjunctionImpl())) } };
+        return new Object[][] { new Object[] { "and",
+                ApproverConjunction.builder()
+                        .and(Collections.singletonList(
+                            new com.commercetools.api.models.approval_rule.ApproverDisjunctionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverDisjunctionDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverDisjunctionDraftTest.java
index 360591b69d2..1d10f34bcf5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverDisjunctionDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverDisjunctionDraftTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApproverDisjunctionDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApproverDisjunctionDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApproverDisjunctionDraftBuilder builder) {
         ApproverDisjunctionDraft approverDisjunctionDraft = builder.buildUnchecked();
         Assertions.assertThat(approverDisjunctionDraft).isInstanceOf(ApproverDisjunctionDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApproverDisjunctionDraft.builder()
-                .or(Collections
-                        .singletonList(new com.commercetools.api.models.approval_rule.RuleApproverDraftImpl())) } };
+        return new Object[][] { new Object[] { "or",
+                ApproverDisjunctionDraft.builder()
+                        .or(Collections.singletonList(
+                            new com.commercetools.api.models.approval_rule.RuleApproverDraftImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverDisjunctionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverDisjunctionTest.java
index 11ba1d43643..24f24bb5c3c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverDisjunctionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverDisjunctionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApproverDisjunctionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApproverDisjunctionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApproverDisjunctionBuilder builder) {
         ApproverDisjunction approverDisjunction = builder.buildUnchecked();
         Assertions.assertThat(approverDisjunction).isInstanceOf(ApproverDisjunction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApproverDisjunction.builder()
+        return new Object[][] { new Object[] { "or", ApproverDisjunction.builder()
                 .or(Collections.singletonList(new com.commercetools.api.models.approval_rule.RuleApproverImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverHierarchyDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverHierarchyDraftTest.java
index ce9917ea8fa..3a87eb83d0e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverHierarchyDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverHierarchyDraftTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApproverHierarchyDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApproverHierarchyDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApproverHierarchyDraftBuilder builder) {
         ApproverHierarchyDraft approverHierarchyDraft = builder.buildUnchecked();
         Assertions.assertThat(approverHierarchyDraft).isInstanceOf(ApproverHierarchyDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApproverHierarchyDraft.builder()
-                .tiers(Collections.singletonList(
-                    new com.commercetools.api.models.approval_rule.ApproverConjunctionDraftImpl())) } };
+        return new Object[][] { new Object[] { "tiers",
+                ApproverHierarchyDraft.builder()
+                        .tiers(Collections.singletonList(
+                            new com.commercetools.api.models.approval_rule.ApproverConjunctionDraftImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverHierarchyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverHierarchyTest.java
index fcd634ac1ea..65abd2ad923 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverHierarchyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/ApproverHierarchyTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApproverHierarchyTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApproverHierarchyBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApproverHierarchyBuilder builder) {
         ApproverHierarchy approverHierarchy = builder.buildUnchecked();
         Assertions.assertThat(approverHierarchy).isInstanceOf(ApproverHierarchy.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApproverHierarchy.builder()
-                .tiers(Collections
-                        .singletonList(new com.commercetools.api.models.approval_rule.ApproverConjunctionImpl())) } };
+        return new Object[][] { new Object[] { "tiers",
+                ApproverHierarchy.builder()
+                        .tiers(Collections.singletonList(
+                            new com.commercetools.api.models.approval_rule.ApproverConjunctionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleApproverDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleApproverDraftTest.java
index f6f721b22fa..60ee4a3e152 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleApproverDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleApproverDraftTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.approval_rule;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RuleApproverDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RuleApproverDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RuleApproverDraftBuilder builder) {
         RuleApproverDraft ruleApproverDraft = builder.buildUnchecked();
         Assertions.assertThat(ruleApproverDraft).isInstanceOf(RuleApproverDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RuleApproverDraft.builder()
-                .associateRole(
-                    new com.commercetools.api.models.associate_role.AssociateRoleResourceIdentifierImpl()) } };
+        return new Object[][] { new Object[] { "associateRole",
+                RuleApproverDraft.builder()
+                        .associateRole(
+                            new com.commercetools.api.models.associate_role.AssociateRoleResourceIdentifierImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleApproverTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleApproverTest.java
index 0487c0381f2..a378a61a44e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleApproverTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleApproverTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.approval_rule;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RuleApproverTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RuleApproverBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RuleApproverBuilder builder) {
         RuleApprover ruleApprover = builder.buildUnchecked();
         Assertions.assertThat(ruleApprover).isInstanceOf(RuleApprover.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RuleApprover.builder()
+        return new Object[][] { new Object[] { "associateRole", RuleApprover.builder()
                 .associateRole(new com.commercetools.api.models.associate_role.AssociateRoleKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleRequesterDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleRequesterDraftTest.java
index 455d6683eb8..75f3f948e16 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleRequesterDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleRequesterDraftTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.approval_rule;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RuleRequesterDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RuleRequesterDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RuleRequesterDraftBuilder builder) {
         RuleRequesterDraft ruleRequesterDraft = builder.buildUnchecked();
         Assertions.assertThat(ruleRequesterDraft).isInstanceOf(RuleRequesterDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RuleRequesterDraft.builder()
-                .associateRole(
-                    new com.commercetools.api.models.associate_role.AssociateRoleResourceIdentifierImpl()) } };
+        return new Object[][] { new Object[] { "associateRole",
+                RuleRequesterDraft.builder()
+                        .associateRole(
+                            new com.commercetools.api.models.associate_role.AssociateRoleResourceIdentifierImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleRequesterTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleRequesterTest.java
index c0fee213b67..a5ea3f6e234 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleRequesterTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/approval_rule/RuleRequesterTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.approval_rule;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RuleRequesterTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RuleRequesterBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RuleRequesterBuilder builder) {
         RuleRequester ruleRequester = builder.buildUnchecked();
         Assertions.assertThat(ruleRequester).isInstanceOf(RuleRequester.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RuleRequester.builder()
+        return new Object[][] { new Object[] { "associateRole", RuleRequester.builder()
                 .associateRole(new com.commercetools.api.models.associate_role.AssociateRoleKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleAddPermissionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleAddPermissionActionTest.java
index 42f98330b67..da7e2f3d08e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleAddPermissionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleAddPermissionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.associate_role;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleAddPermissionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleAddPermissionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleAddPermissionActionBuilder builder) {
         AssociateRoleAddPermissionAction associateRoleAddPermissionAction = builder.buildUnchecked();
         Assertions.assertThat(associateRoleAddPermissionAction).isInstanceOf(AssociateRoleAddPermissionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleAddPermissionAction.builder()
+        return new Object[][] { new Object[] { "permission", AssociateRoleAddPermissionAction.builder()
                 .permission(com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleChangeBuyerAssignableActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleChangeBuyerAssignableActionTest.java
index 1a7487f0e57..7345cc7f15d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleChangeBuyerAssignableActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleChangeBuyerAssignableActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.associate_role;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleChangeBuyerAssignableActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleChangeBuyerAssignableActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleChangeBuyerAssignableActionBuilder builder) {
         AssociateRoleChangeBuyerAssignableAction associateRoleChangeBuyerAssignableAction = builder.buildUnchecked();
         Assertions.assertThat(associateRoleChangeBuyerAssignableAction)
                 .isInstanceOf(AssociateRoleChangeBuyerAssignableAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { AssociateRoleChangeBuyerAssignableAction.builder().buyerAssignable(true) } };
+        return new Object[][] { new Object[] { "buyerAssignable",
+                AssociateRoleChangeBuyerAssignableAction.builder().buyerAssignable(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleDraftTest.java
index aaeca9fa5c1..eaf739a28a1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleDraftTest.java
@@ -3,36 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleDraftBuilder builder) {
         AssociateRoleDraft associateRoleDraft = builder.buildUnchecked();
         Assertions.assertThat(associateRoleDraft).isInstanceOf(AssociateRoleDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleDraft.builder().key("key") },
-                new Object[] { AssociateRoleDraft.builder().name("name") },
-                new Object[] { AssociateRoleDraft.builder().buyerAssignable(true) },
-                new Object[] { AssociateRoleDraft.builder()
+        return new Object[][] { new Object[] { "key", AssociateRoleDraft.builder().key("key") },
+                new Object[] { "name", AssociateRoleDraft.builder().name("name") },
+                new Object[] { "buyerAssignable", AssociateRoleDraft.builder().buyerAssignable(true) },
+                new Object[] { "permissions", AssociateRoleDraft.builder()
                         .permissions(Collections.singletonList(
                             com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits"))) },
-                new Object[] { AssociateRoleDraft.builder()
+                new Object[] { "custom", AssociateRoleDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleKeyReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleKeyReferenceTest.java
index cd857f9f9c3..c2a4c42d0cc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleKeyReferenceTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.associate_role;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleKeyReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleKeyReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleKeyReferenceBuilder builder) {
         AssociateRoleKeyReference associateRoleKeyReference = builder.buildUnchecked();
         Assertions.assertThat(associateRoleKeyReference).isInstanceOf(AssociateRoleKeyReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleKeyReference.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", AssociateRoleKeyReference.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRolePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRolePagedQueryResponseTest.java
index c2617740407..a8947031a91 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRolePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRolePagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRolePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRolePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRolePagedQueryResponseBuilder builder) {
         AssociateRolePagedQueryResponse associateRolePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(associateRolePagedQueryResponse).isInstanceOf(AssociateRolePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRolePagedQueryResponse.builder().limit(7L) },
-                new Object[] { AssociateRolePagedQueryResponse.builder().offset(3L) },
-                new Object[] { AssociateRolePagedQueryResponse.builder().count(2L) },
-                new Object[] { AssociateRolePagedQueryResponse.builder().total(1L) },
-                new Object[] { AssociateRolePagedQueryResponse.builder()
-                        .results(Collections.singletonList(
-                            new com.commercetools.api.models.associate_role.AssociateRoleImpl())) } };
+        return new Object[][] { new Object[] { "limit", AssociateRolePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", AssociateRolePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", AssociateRolePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", AssociateRolePagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        AssociateRolePagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.associate_role.AssociateRoleImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleReferenceTest.java
index d70b81e8fbd..17288ead282 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.associate_role;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleReferenceBuilder builder) {
         AssociateRoleReference associateRoleReference = builder.buildUnchecked();
         Assertions.assertThat(associateRoleReference).isInstanceOf(AssociateRoleReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { AssociateRoleReference.builder()
-                        .obj(new com.commercetools.api.models.associate_role.AssociateRoleImpl()) },
-                new Object[] { AssociateRoleReference.builder().id("id") } };
+                new Object[] { "obj",
+                        AssociateRoleReference.builder()
+                                .obj(new com.commercetools.api.models.associate_role.AssociateRoleImpl()) },
+                new Object[] { "id", AssociateRoleReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleRemovePermissionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleRemovePermissionActionTest.java
index 79783f67816..22eddaa8472 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleRemovePermissionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleRemovePermissionActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.associate_role;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleRemovePermissionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleRemovePermissionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleRemovePermissionActionBuilder builder) {
         AssociateRoleRemovePermissionAction associateRoleRemovePermissionAction = builder.buildUnchecked();
         Assertions.assertThat(associateRoleRemovePermissionAction)
                 .isInstanceOf(AssociateRoleRemovePermissionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleRemovePermissionAction.builder()
+        return new Object[][] { new Object[] { "permission", AssociateRoleRemovePermissionAction.builder()
                 .permission(com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleResourceIdentifierTest.java
index 9b87e55c7fa..58fea674db8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.associate_role;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleResourceIdentifierBuilder builder) {
         AssociateRoleResourceIdentifier associateRoleResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(associateRoleResourceIdentifier).isInstanceOf(AssociateRoleResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleResourceIdentifier.builder().id("id") },
-                new Object[] { AssociateRoleResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", AssociateRoleResourceIdentifier.builder().id("id") },
+                new Object[] { "key", AssociateRoleResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetCustomFieldActionTest.java
index 56ce38865ef..9d75db22618 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.associate_role;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleSetCustomFieldActionBuilder builder) {
         AssociateRoleSetCustomFieldAction associateRoleSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(associateRoleSetCustomFieldAction).isInstanceOf(AssociateRoleSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleSetCustomFieldAction.builder().name("name") },
-                new Object[] { AssociateRoleSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", AssociateRoleSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", AssociateRoleSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetCustomTypeActionTest.java
index 7f1b8c0cc9e..d8583edfe99 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.associate_role;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleSetCustomTypeActionBuilder builder) {
         AssociateRoleSetCustomTypeAction associateRoleSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(associateRoleSetCustomTypeAction).isInstanceOf(AssociateRoleSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { AssociateRoleSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { AssociateRoleSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        AssociateRoleSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", AssociateRoleSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetNameActionTest.java
index 17a58ad1327..ce97f2f19de 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.associate_role;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleSetNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleSetNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleSetNameActionBuilder builder) {
         AssociateRoleSetNameAction associateRoleSetNameAction = builder.buildUnchecked();
         Assertions.assertThat(associateRoleSetNameAction).isInstanceOf(AssociateRoleSetNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleSetNameAction.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", AssociateRoleSetNameAction.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetPermissionsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetPermissionsActionTest.java
index c3645599a9a..1f8ce371a4d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetPermissionsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleSetPermissionsActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleSetPermissionsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleSetPermissionsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleSetPermissionsActionBuilder builder) {
         AssociateRoleSetPermissionsAction associateRoleSetPermissionsAction = builder.buildUnchecked();
         Assertions.assertThat(associateRoleSetPermissionsAction).isInstanceOf(AssociateRoleSetPermissionsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleSetPermissionsAction.builder()
-                .permissions(Collections.singletonList(
-                    com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits"))) } };
+        return new Object[][] { new Object[] { "permissions",
+                AssociateRoleSetPermissionsAction.builder()
+                        .permissions(Collections.singletonList(
+                            com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits"))) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleTest.java
index 03e775ad0b5..f58a5bddd95 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleTest.java
@@ -4,44 +4,39 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleBuilder builder) {
         AssociateRole associateRole = builder.buildUnchecked();
         Assertions.assertThat(associateRole).isInstanceOf(AssociateRole.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRole.builder().id("id") },
-                new Object[] { AssociateRole.builder().version(2L) },
-                new Object[] { AssociateRole.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { AssociateRole.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { AssociateRole.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", AssociateRole.builder().id("id") },
+                new Object[] { "version", AssociateRole.builder().version(2L) },
+                new Object[] { "createdAt",
+                        AssociateRole.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        AssociateRole.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        AssociateRole.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         AssociateRole.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { AssociateRole.builder().key("key") },
-                new Object[] { AssociateRole.builder().buyerAssignable(true) },
-                new Object[] { AssociateRole.builder().name("name") },
-                new Object[] { AssociateRole.builder()
+                new Object[] { "key", AssociateRole.builder().key("key") },
+                new Object[] { "buyerAssignable", AssociateRole.builder().buyerAssignable(true) },
+                new Object[] { "name", AssociateRole.builder().name("name") },
+                new Object[] { "permissions", AssociateRole.builder()
                         .permissions(Collections.singletonList(
                             com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits"))) },
-                new Object[] {
+                new Object[] { "custom",
                         AssociateRole.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleUpdateTest.java
index 4ae283e9aec..a23237a868d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/associate_role/AssociateRoleUpdateTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleUpdateBuilder builder) {
         AssociateRoleUpdate associateRoleUpdate = builder.buildUnchecked();
         Assertions.assertThat(associateRoleUpdate).isInstanceOf(AssociateRoleUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleUpdate.builder().version(2L) },
-                new Object[] { AssociateRoleUpdate.builder()
+        return new Object[][] { new Object[] { "version", AssociateRoleUpdate.builder().version(2L) },
+                new Object[] { "actions", AssociateRoleUpdate.builder()
                         .actions(Collections.singletonList(
                             new com.commercetools.api.models.associate_role.AssociateRoleUpdateActionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupAddAttributeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupAddAttributeActionTest.java
index 8f7f2e387a9..77f9199bdf1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupAddAttributeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupAddAttributeActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.attribute_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeGroupAddAttributeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeGroupAddAttributeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeGroupAddAttributeActionBuilder builder) {
         AttributeGroupAddAttributeAction attributeGroupAddAttributeAction = builder.buildUnchecked();
         Assertions.assertThat(attributeGroupAddAttributeAction).isInstanceOf(AttributeGroupAddAttributeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeGroupAddAttributeAction.builder()
+        return new Object[][] { new Object[] { "attribute", AttributeGroupAddAttributeAction.builder()
                 .attribute(new com.commercetools.api.models.attribute_group.AttributeReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupChangeNameActionTest.java
index 8c9da522ac7..99190553f26 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.attribute_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeGroupChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeGroupChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeGroupChangeNameActionBuilder builder) {
         AttributeGroupChangeNameAction attributeGroupChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(attributeGroupChangeNameAction).isInstanceOf(AttributeGroupChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeGroupChangeNameAction.builder()
+        return new Object[][] { new Object[] { "name", AttributeGroupChangeNameAction.builder()
                 .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupDraftTest.java
index 3be0f6ad232..7dc4b20d91e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupDraftTest.java
@@ -3,38 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeGroupDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeGroupDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeGroupDraftBuilder builder) {
         AttributeGroupDraft attributeGroupDraft = builder.buildUnchecked();
         Assertions.assertThat(attributeGroupDraft).isInstanceOf(AttributeGroupDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { AttributeGroupDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { AttributeGroupDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { AttributeGroupDraft.builder()
-                        .attributes(Collections.singletonList(
-                            new com.commercetools.api.models.attribute_group.AttributeReferenceImpl())) },
-                new Object[] { AttributeGroupDraft.builder().key("key") } };
+                new Object[] { "name",
+                        AttributeGroupDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
+                        AttributeGroupDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "attributes",
+                        AttributeGroupDraft.builder()
+                                .attributes(Collections.singletonList(
+                                    new com.commercetools.api.models.attribute_group.AttributeReferenceImpl())) },
+                new Object[] { "key", AttributeGroupDraft.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupPagedQueryResponseTest.java
index 786854a4270..5c88762d68c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeGroupPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeGroupPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeGroupPagedQueryResponseBuilder builder) {
         AttributeGroupPagedQueryResponse attributeGroupPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(attributeGroupPagedQueryResponse).isInstanceOf(AttributeGroupPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeGroupPagedQueryResponse.builder().limit(7L) },
-                new Object[] { AttributeGroupPagedQueryResponse.builder().offset(3L) },
-                new Object[] { AttributeGroupPagedQueryResponse.builder().count(2L) },
-                new Object[] { AttributeGroupPagedQueryResponse.builder().total(1L) },
-                new Object[] { AttributeGroupPagedQueryResponse.builder()
-                        .results(Collections.singletonList(
-                            new com.commercetools.api.models.attribute_group.AttributeGroupImpl())) } };
+        return new Object[][] { new Object[] { "limit", AttributeGroupPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", AttributeGroupPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", AttributeGroupPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", AttributeGroupPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        AttributeGroupPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.attribute_group.AttributeGroupImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupReferenceTest.java
index 20978bd9b1f..786219421be 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.attribute_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeGroupReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeGroupReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeGroupReferenceBuilder builder) {
         AttributeGroupReference attributeGroupReference = builder.buildUnchecked();
         Assertions.assertThat(attributeGroupReference).isInstanceOf(AttributeGroupReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { AttributeGroupReference.builder()
-                        .obj(new com.commercetools.api.models.attribute_group.AttributeGroupImpl()) },
-                new Object[] { AttributeGroupReference.builder().id("id") } };
+                new Object[] { "obj",
+                        AttributeGroupReference.builder()
+                                .obj(new com.commercetools.api.models.attribute_group.AttributeGroupImpl()) },
+                new Object[] { "id", AttributeGroupReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupRemoveAttributeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupRemoveAttributeActionTest.java
index bce68084acb..8b95b490238 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupRemoveAttributeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupRemoveAttributeActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.attribute_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeGroupRemoveAttributeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeGroupRemoveAttributeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeGroupRemoveAttributeActionBuilder builder) {
         AttributeGroupRemoveAttributeAction attributeGroupRemoveAttributeAction = builder.buildUnchecked();
         Assertions.assertThat(attributeGroupRemoveAttributeAction)
                 .isInstanceOf(AttributeGroupRemoveAttributeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeGroupRemoveAttributeAction.builder()
+        return new Object[][] { new Object[] { "attribute", AttributeGroupRemoveAttributeAction.builder()
                 .attribute(new com.commercetools.api.models.attribute_group.AttributeReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupResourceIdentifierTest.java
index 49788a7b4cb..5dd26d5bf2b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.attribute_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeGroupResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeGroupResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeGroupResourceIdentifierBuilder builder) {
         AttributeGroupResourceIdentifier attributeGroupResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(attributeGroupResourceIdentifier).isInstanceOf(AttributeGroupResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeGroupResourceIdentifier.builder().id("id") },
-                new Object[] { AttributeGroupResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", AttributeGroupResourceIdentifier.builder().id("id") },
+                new Object[] { "key", AttributeGroupResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupSetAttributesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupSetAttributesActionTest.java
index 6ac95a74867..6836a431c93 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupSetAttributesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupSetAttributesActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeGroupSetAttributesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeGroupSetAttributesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeGroupSetAttributesActionBuilder builder) {
         AttributeGroupSetAttributesAction attributeGroupSetAttributesAction = builder.buildUnchecked();
         Assertions.assertThat(attributeGroupSetAttributesAction).isInstanceOf(AttributeGroupSetAttributesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeGroupSetAttributesAction.builder()
-                .attributes(Collections
-                        .singletonList(new com.commercetools.api.models.attribute_group.AttributeReferenceImpl())) } };
+        return new Object[][] { new Object[] { "attributes",
+                AttributeGroupSetAttributesAction.builder()
+                        .attributes(Collections.singletonList(
+                            new com.commercetools.api.models.attribute_group.AttributeReferenceImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupSetDescriptionActionTest.java
index 2c63cfd34d7..bfc30b46480 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupSetDescriptionActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.attribute_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeGroupSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeGroupSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeGroupSetDescriptionActionBuilder builder) {
         AttributeGroupSetDescriptionAction attributeGroupSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(attributeGroupSetDescriptionAction)
                 .isInstanceOf(AttributeGroupSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeGroupSetDescriptionAction.builder()
+        return new Object[][] { new Object[] { "description", AttributeGroupSetDescriptionAction.builder()
                 .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupSetKeyActionTest.java
index f96eff9a5a9..be3b2c081d6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.attribute_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeGroupSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeGroupSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeGroupSetKeyActionBuilder builder) {
         AttributeGroupSetKeyAction attributeGroupSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(attributeGroupSetKeyAction).isInstanceOf(AttributeGroupSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeGroupSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", AttributeGroupSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupTest.java
index 9dbcac7bfbd..4d4595e93a6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupTest.java
@@ -4,45 +4,42 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeGroupTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeGroupBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeGroupBuilder builder) {
         AttributeGroup attributeGroup = builder.buildUnchecked();
         Assertions.assertThat(attributeGroup).isInstanceOf(AttributeGroup.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeGroup.builder().id("id") },
-                new Object[] { AttributeGroup.builder().version(2L) },
-                new Object[] { AttributeGroup.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { AttributeGroup.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { AttributeGroup.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", AttributeGroup.builder().id("id") },
+                new Object[] { "version", AttributeGroup.builder().version(2L) },
+                new Object[] { "createdAt",
+                        AttributeGroup.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        AttributeGroup.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        AttributeGroup.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         AttributeGroup.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] {
+                new Object[] { "name",
                         AttributeGroup.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { AttributeGroup.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { AttributeGroup.builder()
-                        .attributes(Collections.singletonList(
-                            new com.commercetools.api.models.attribute_group.AttributeReferenceImpl())) },
-                new Object[] { AttributeGroup.builder().key("key") } };
+                new Object[] { "description",
+                        AttributeGroup.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "attributes",
+                        AttributeGroup.builder()
+                                .attributes(Collections.singletonList(
+                                    new com.commercetools.api.models.attribute_group.AttributeReferenceImpl())) },
+                new Object[] { "key", AttributeGroup.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupUpdateTest.java
index d5e0b036ed8..e4938bd1072 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeGroupUpdateTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeGroupUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeGroupUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeGroupUpdateBuilder builder) {
         AttributeGroupUpdate attributeGroupUpdate = builder.buildUnchecked();
         Assertions.assertThat(attributeGroupUpdate).isInstanceOf(AttributeGroupUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeGroupUpdate.builder().version(2L) },
-                new Object[] { AttributeGroupUpdate.builder()
+        return new Object[][] { new Object[] { "version", AttributeGroupUpdate.builder().version(2L) },
+                new Object[] { "actions", AttributeGroupUpdate.builder()
                         .actions(Collections.singletonList(
                             new com.commercetools.api.models.attribute_group.AttributeGroupUpdateActionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeReferenceTest.java
index 1b27ee77d62..5a480c30acc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/attribute_group/AttributeReferenceTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.attribute_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeReferenceBuilder builder) {
         AttributeReference attributeReference = builder.buildUnchecked();
         Assertions.assertThat(attributeReference).isInstanceOf(AttributeReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeReference.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", AttributeReference.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateDraftTest.java
index 72b16cd33e6..fe461acfc5b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateDraftTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateDraftBuilder builder) {
         AssociateDraft associateDraft = builder.buildUnchecked();
         Assertions.assertThat(associateDraft).isInstanceOf(AssociateDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { AssociateDraft.builder()
+                new Object[] { "associateRoleAssignments", AssociateDraft.builder()
                         .associateRoleAssignments(Collections.singletonList(
                             new com.commercetools.api.models.business_unit.AssociateRoleAssignmentDraftImpl())) },
-                new Object[] { AssociateDraft.builder()
+                new Object[] { "customer", AssociateDraft.builder()
                         .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateRoleAssignmentDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateRoleAssignmentDraftTest.java
index ad697dd68cd..e57393b580d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateRoleAssignmentDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateRoleAssignmentDraftTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleAssignmentDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleAssignmentDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleAssignmentDraftBuilder builder) {
         AssociateRoleAssignmentDraft associateRoleAssignmentDraft = builder.buildUnchecked();
         Assertions.assertThat(associateRoleAssignmentDraft).isInstanceOf(AssociateRoleAssignmentDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleAssignmentDraft.builder()
+        return new Object[][] { new Object[] { "associateRole", AssociateRoleAssignmentDraft.builder()
                 .associateRole(new com.commercetools.api.models.associate_role.AssociateRoleResourceIdentifierImpl()) },
-                new Object[] { AssociateRoleAssignmentDraft.builder()
-                        .inheritance(com.commercetools.api.models.business_unit.AssociateRoleInheritanceMode
-                                .findEnum("Enabled")) } };
+                new Object[] { "inheritance",
+                        AssociateRoleAssignmentDraft.builder()
+                                .inheritance(com.commercetools.api.models.business_unit.AssociateRoleInheritanceMode
+                                        .findEnum("Enabled")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateRoleAssignmentTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateRoleAssignmentTest.java
index 0f2fa58dcdb..00b169df625 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateRoleAssignmentTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateRoleAssignmentTest.java
@@ -1,34 +1,30 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleAssignmentTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleAssignmentBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleAssignmentBuilder builder) {
         AssociateRoleAssignment associateRoleAssignment = builder.buildUnchecked();
         Assertions.assertThat(associateRoleAssignment).isInstanceOf(AssociateRoleAssignment.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleAssignment.builder()
-                .associateRole(new com.commercetools.api.models.associate_role.AssociateRoleKeyReferenceImpl()) },
-                new Object[] { AssociateRoleAssignment.builder()
-                        .inheritance(com.commercetools.api.models.business_unit.AssociateRoleInheritanceMode
-                                .findEnum("Enabled")) } };
+        return new Object[][] {
+                new Object[] { "associateRole",
+                        AssociateRoleAssignment.builder()
+                                .associateRole(
+                                    new com.commercetools.api.models.associate_role.AssociateRoleKeyReferenceImpl()) },
+                new Object[] { "inheritance",
+                        AssociateRoleAssignment.builder()
+                                .inheritance(com.commercetools.api.models.business_unit.AssociateRoleInheritanceMode
+                                        .findEnum("Enabled")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateTest.java
index d9f808b686a..290d5ae54fe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/AssociateTest.java
@@ -3,34 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateBuilder builder) {
         Associate associate = builder.buildUnchecked();
         Assertions.assertThat(associate).isInstanceOf(Associate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { Associate.builder()
-                        .associateRoleAssignments(Collections.singletonList(
-                            new com.commercetools.api.models.business_unit.AssociateRoleAssignmentImpl())) },
-                new Object[] { Associate.builder()
+                new Object[] { "associateRoleAssignments",
+                        Associate.builder()
+                                .associateRoleAssignments(Collections.singletonList(
+                                    new com.commercetools.api.models.business_unit.AssociateRoleAssignmentImpl())) },
+                new Object[] { "customer", Associate.builder()
                         .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddAddressActionTest.java
index dc01b6326db..eff7a0dcb86 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddAddressActionBuilder builder) {
         BusinessUnitAddAddressAction businessUnitAddAddressAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAddAddressAction).isInstanceOf(BusinessUnitAddAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddAddressAction.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitAddAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddAssociateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddAssociateActionTest.java
index ee543239f72..d645c4e8125 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddAssociateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddAssociateActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddAssociateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddAssociateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddAssociateActionBuilder builder) {
         BusinessUnitAddAssociateAction businessUnitAddAssociateAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAddAssociateAction).isInstanceOf(BusinessUnitAddAssociateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddAssociateAction.builder()
+        return new Object[][] { new Object[] { "associate", BusinessUnitAddAssociateAction.builder()
                 .associate(new com.commercetools.api.models.business_unit.AssociateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddBillingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddBillingAddressIdActionTest.java
index d0a935b9d0b..fd606542556 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddBillingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddBillingAddressIdActionTest.java
@@ -1,32 +1,26 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddBillingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddBillingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddBillingAddressIdActionBuilder builder) {
         BusinessUnitAddBillingAddressIdAction businessUnitAddBillingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAddBillingAddressIdAction)
                 .isInstanceOf(BusinessUnitAddBillingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddBillingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { BusinessUnitAddBillingAddressIdAction.builder().addressKey("addressKey") } };
+        return new Object[][] {
+                new Object[] { "addressId", BusinessUnitAddBillingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        BusinessUnitAddBillingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddShippingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddShippingAddressIdActionTest.java
index 145eacdc5f1..40b61089dea 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddShippingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddShippingAddressIdActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddShippingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddShippingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddShippingAddressIdActionBuilder builder) {
         BusinessUnitAddShippingAddressIdAction businessUnitAddShippingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAddShippingAddressIdAction)
                 .isInstanceOf(BusinessUnitAddShippingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitAddShippingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { BusinessUnitAddShippingAddressIdAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId", BusinessUnitAddShippingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        BusinessUnitAddShippingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddStoreActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddStoreActionTest.java
index 93fae6ebc0a..35f4cbe0740 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddStoreActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAddStoreActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddStoreActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddStoreActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddStoreActionBuilder builder) {
         BusinessUnitAddStoreAction businessUnitAddStoreAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAddStoreAction).isInstanceOf(BusinessUnitAddStoreAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddStoreAction.builder()
+        return new Object[][] { new Object[] { "store", BusinessUnitAddStoreAction.builder()
                 .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAssociateResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAssociateResponseTest.java
index 812d3963e46..44895b81d80 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAssociateResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitAssociateResponseTest.java
@@ -3,39 +3,34 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAssociateResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAssociateResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAssociateResponseBuilder builder) {
         BusinessUnitAssociateResponse businessUnitAssociateResponse = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAssociateResponse).isInstanceOf(BusinessUnitAssociateResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitAssociateResponse.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { BusinessUnitAssociateResponse.builder()
-                        .associateRoles(Collections
-                                .singletonList(new com.commercetools.api.models.associate_role.AssociateRoleImpl())) },
-                new Object[] { BusinessUnitAssociateResponse.builder()
-                        .inheritedAssociateRoles(Collections
-                                .singletonList(new com.commercetools.api.models.associate_role.AssociateRoleImpl())) },
-                new Object[] { BusinessUnitAssociateResponse.builder()
+                new Object[] { "customer",
+                        BusinessUnitAssociateResponse.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "associateRoles",
+                        BusinessUnitAssociateResponse.builder()
+                                .associateRoles(Collections.singletonList(
+                                    new com.commercetools.api.models.associate_role.AssociateRoleImpl())) },
+                new Object[] { "inheritedAssociateRoles",
+                        BusinessUnitAssociateResponse.builder()
+                                .inheritedAssociateRoles(Collections.singletonList(
+                                    new com.commercetools.api.models.associate_role.AssociateRoleImpl())) },
+                new Object[] { "permissions", BusinessUnitAssociateResponse.builder()
                         .permissions(Collections.singletonList(
                             com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits"))) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeAddressActionTest.java
index 0683a111366..aebfa41b018 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeAddressActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitChangeAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitChangeAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitChangeAddressActionBuilder builder) {
         BusinessUnitChangeAddressAction businessUnitChangeAddressAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitChangeAddressAction).isInstanceOf(BusinessUnitChangeAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitChangeAddressAction.builder().addressId("addressId") },
-                new Object[] { BusinessUnitChangeAddressAction.builder().addressKey("addressKey") },
-                new Object[] { BusinessUnitChangeAddressAction.builder()
+        return new Object[][] {
+                new Object[] { "addressId", BusinessUnitChangeAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey", BusinessUnitChangeAddressAction.builder().addressKey("addressKey") },
+                new Object[] { "address", BusinessUnitChangeAddressAction.builder()
                         .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeApprovalRuleModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeApprovalRuleModeActionTest.java
index f22dccae7aa..daa181c4c6d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeApprovalRuleModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeApprovalRuleModeActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitChangeApprovalRuleModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitChangeApprovalRuleModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitChangeApprovalRuleModeActionBuilder builder) {
         BusinessUnitChangeApprovalRuleModeAction businessUnitChangeApprovalRuleModeAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitChangeApprovalRuleModeAction)
                 .isInstanceOf(BusinessUnitChangeApprovalRuleModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitChangeApprovalRuleModeAction.builder()
+        return new Object[][] { new Object[] { "approvalRuleMode", BusinessUnitChangeApprovalRuleModeAction.builder()
                 .approvalRuleMode(
                     com.commercetools.api.models.business_unit.BusinessUnitApprovalRuleMode.findEnum("Explicit")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeAssociateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeAssociateActionTest.java
index fa9340a711c..3cf1f6efc4a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeAssociateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeAssociateActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitChangeAssociateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitChangeAssociateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitChangeAssociateActionBuilder builder) {
         BusinessUnitChangeAssociateAction businessUnitChangeAssociateAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitChangeAssociateAction).isInstanceOf(BusinessUnitChangeAssociateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitChangeAssociateAction.builder()
+        return new Object[][] { new Object[] { "associate", BusinessUnitChangeAssociateAction.builder()
                 .associate(new com.commercetools.api.models.business_unit.AssociateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeAssociateModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeAssociateModeActionTest.java
index de783f2125a..667aa26b492 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeAssociateModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeAssociateModeActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitChangeAssociateModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitChangeAssociateModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitChangeAssociateModeActionBuilder builder) {
         BusinessUnitChangeAssociateModeAction businessUnitChangeAssociateModeAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitChangeAssociateModeAction)
                 .isInstanceOf(BusinessUnitChangeAssociateModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitChangeAssociateModeAction.builder()
+        return new Object[][] { new Object[] { "associateMode", BusinessUnitChangeAssociateModeAction.builder()
                 .associateMode(
                     com.commercetools.api.models.business_unit.BusinessUnitAssociateMode.findEnum("Explicit")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeNameActionTest.java
index 856204ae2ec..04466b52c7d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitChangeNameActionBuilder builder) {
         BusinessUnitChangeNameAction businessUnitChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitChangeNameAction).isInstanceOf(BusinessUnitChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitChangeNameAction.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", BusinessUnitChangeNameAction.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeParentUnitActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeParentUnitActionTest.java
index 20193194d58..ebd39c42b12 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeParentUnitActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeParentUnitActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitChangeParentUnitActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitChangeParentUnitActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitChangeParentUnitActionBuilder builder) {
         BusinessUnitChangeParentUnitAction businessUnitChangeParentUnitAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitChangeParentUnitAction)
                 .isInstanceOf(BusinessUnitChangeParentUnitAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitChangeParentUnitAction.builder()
+        return new Object[][] { new Object[] { "parentUnit", BusinessUnitChangeParentUnitAction.builder()
                 .parentUnit(new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeStatusActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeStatusActionTest.java
index dae0c3d4d19..a00e50a65a5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeStatusActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitChangeStatusActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitChangeStatusActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitChangeStatusActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitChangeStatusActionBuilder builder) {
         BusinessUnitChangeStatusAction businessUnitChangeStatusAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitChangeStatusAction).isInstanceOf(BusinessUnitChangeStatusAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitChangeStatusAction.builder().status("status") } };
+        return new Object[][] { new Object[] { "status", BusinessUnitChangeStatusAction.builder().status("status") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitKeyReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitKeyReferenceTest.java
index 5451bfe4578..7c36c7695f9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitKeyReferenceTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitKeyReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitKeyReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitKeyReferenceBuilder builder) {
         BusinessUnitKeyReference businessUnitKeyReference = builder.buildUnchecked();
         Assertions.assertThat(businessUnitKeyReference).isInstanceOf(BusinessUnitKeyReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitKeyReference.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", BusinessUnitKeyReference.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitPagedQueryResponseTest.java
index 0aba057e990..9d1be91438c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitPagedQueryResponseBuilder builder) {
         BusinessUnitPagedQueryResponse businessUnitPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(businessUnitPagedQueryResponse).isInstanceOf(BusinessUnitPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitPagedQueryResponse.builder().limit(7L) },
-                new Object[] { BusinessUnitPagedQueryResponse.builder().offset(3L) },
-                new Object[] { BusinessUnitPagedQueryResponse.builder().count(2L) },
-                new Object[] { BusinessUnitPagedQueryResponse.builder().total(1L) },
-                new Object[] { BusinessUnitPagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.business_unit.BusinessUnitImpl())) } };
+        return new Object[][] { new Object[] { "limit", BusinessUnitPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", BusinessUnitPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", BusinessUnitPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", BusinessUnitPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        BusinessUnitPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.business_unit.BusinessUnitImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitReferenceTest.java
index 3bff9f6eb9c..2ced67940e4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitReferenceBuilder builder) {
         BusinessUnitReference businessUnitReference = builder.buildUnchecked();
         Assertions.assertThat(businessUnitReference).isInstanceOf(BusinessUnitReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitReference.builder()
-                        .obj(new com.commercetools.api.models.business_unit.BusinessUnitImpl()) },
-                new Object[] { BusinessUnitReference.builder().id("id") } };
+                new Object[] { "obj",
+                        BusinessUnitReference.builder()
+                                .obj(new com.commercetools.api.models.business_unit.BusinessUnitImpl()) },
+                new Object[] { "id", BusinessUnitReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveAddressActionTest.java
index c922a2168d0..e7f70a1d879 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveAddressActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitRemoveAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitRemoveAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitRemoveAddressActionBuilder builder) {
         BusinessUnitRemoveAddressAction businessUnitRemoveAddressAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitRemoveAddressAction).isInstanceOf(BusinessUnitRemoveAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitRemoveAddressAction.builder().addressId("addressId") },
-                new Object[] { BusinessUnitRemoveAddressAction.builder().addressKey("addressKey") } };
+        return new Object[][] {
+                new Object[] { "addressId", BusinessUnitRemoveAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey", BusinessUnitRemoveAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveAssociateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveAssociateActionTest.java
index 468c07767e9..6ff2121ada3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveAssociateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveAssociateActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitRemoveAssociateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitRemoveAssociateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitRemoveAssociateActionBuilder builder) {
         BusinessUnitRemoveAssociateAction businessUnitRemoveAssociateAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitRemoveAssociateAction).isInstanceOf(BusinessUnitRemoveAssociateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitRemoveAssociateAction.builder()
+        return new Object[][] { new Object[] { "customer", BusinessUnitRemoveAssociateAction.builder()
                 .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveBillingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveBillingAddressIdActionTest.java
index 56bf80de644..be0315b9240 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveBillingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveBillingAddressIdActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitRemoveBillingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitRemoveBillingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitRemoveBillingAddressIdActionBuilder builder) {
         BusinessUnitRemoveBillingAddressIdAction businessUnitRemoveBillingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitRemoveBillingAddressIdAction)
                 .isInstanceOf(BusinessUnitRemoveBillingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitRemoveBillingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { BusinessUnitRemoveBillingAddressIdAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId", BusinessUnitRemoveBillingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        BusinessUnitRemoveBillingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveShippingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveShippingAddressIdActionTest.java
index ee744b7d766..11752b133cb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveShippingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveShippingAddressIdActionTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitRemoveShippingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitRemoveShippingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitRemoveShippingAddressIdActionBuilder builder) {
         BusinessUnitRemoveShippingAddressIdAction businessUnitRemoveShippingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitRemoveShippingAddressIdAction)
                 .isInstanceOf(BusinessUnitRemoveShippingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitRemoveShippingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { BusinessUnitRemoveShippingAddressIdAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId",
+                        BusinessUnitRemoveShippingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        BusinessUnitRemoveShippingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveStoreActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveStoreActionTest.java
index 5d43ef5c4c6..fefa509bc84 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveStoreActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitRemoveStoreActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitRemoveStoreActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitRemoveStoreActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitRemoveStoreActionBuilder builder) {
         BusinessUnitRemoveStoreAction businessUnitRemoveStoreAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitRemoveStoreAction).isInstanceOf(BusinessUnitRemoveStoreAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitRemoveStoreAction.builder()
+        return new Object[][] { new Object[] { "store", BusinessUnitRemoveStoreAction.builder()
                 .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitResourceIdentifierTest.java
index a5ab31d05a9..9eeea9e1212 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitResourceIdentifierBuilder builder) {
         BusinessUnitResourceIdentifier businessUnitResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(businessUnitResourceIdentifier).isInstanceOf(BusinessUnitResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitResourceIdentifier.builder().id("id") },
-                new Object[] { BusinessUnitResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", BusinessUnitResourceIdentifier.builder().id("id") },
+                new Object[] { "key", BusinessUnitResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetAddressCustomFieldActionTest.java
index 5d5001c2a1e..243efeb76e9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetAddressCustomFieldActionTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSetAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSetAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSetAddressCustomFieldActionBuilder builder) {
         BusinessUnitSetAddressCustomFieldAction businessUnitSetAddressCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitSetAddressCustomFieldAction)
                 .isInstanceOf(BusinessUnitSetAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitSetAddressCustomFieldAction.builder().addressId("addressId") },
-                new Object[] { BusinessUnitSetAddressCustomFieldAction.builder().name("name") },
-                new Object[] { BusinessUnitSetAddressCustomFieldAction.builder().value("value") } };
+                new Object[] { "addressId", BusinessUnitSetAddressCustomFieldAction.builder().addressId("addressId") },
+                new Object[] { "name", BusinessUnitSetAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", BusinessUnitSetAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetAddressCustomTypeActionTest.java
index 4f54e8293b3..c1703b2a4b1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetAddressCustomTypeActionTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSetAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSetAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSetAddressCustomTypeActionBuilder builder) {
         BusinessUnitSetAddressCustomTypeAction businessUnitSetAddressCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitSetAddressCustomTypeAction)
                 .isInstanceOf(BusinessUnitSetAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitSetAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { BusinessUnitSetAddressCustomTypeAction.builder()
-                        .fields(new com.commercetools.api.models.type.FieldContainerImpl()) },
-                new Object[] { BusinessUnitSetAddressCustomTypeAction.builder().addressId("addressId") } };
+                new Object[] { "type",
+                        BusinessUnitSetAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields",
+                        BusinessUnitSetAddressCustomTypeAction.builder()
+                                .fields(new com.commercetools.api.models.type.FieldContainerImpl()) },
+                new Object[] { "addressId", BusinessUnitSetAddressCustomTypeAction.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetAssociatesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetAssociatesActionTest.java
index 483d809d071..71898ef9ccc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetAssociatesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetAssociatesActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSetAssociatesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSetAssociatesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSetAssociatesActionBuilder builder) {
         BusinessUnitSetAssociatesAction businessUnitSetAssociatesAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitSetAssociatesAction).isInstanceOf(BusinessUnitSetAssociatesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitSetAssociatesAction.builder()
+        return new Object[][] { new Object[] { "associates", BusinessUnitSetAssociatesAction.builder()
                 .associates(
                     Collections.singletonList(new com.commercetools.api.models.business_unit.AssociateDraftImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetContactEmailActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetContactEmailActionTest.java
index f7a30516a7c..78f6966d9d7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetContactEmailActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetContactEmailActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSetContactEmailActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSetContactEmailActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSetContactEmailActionBuilder builder) {
         BusinessUnitSetContactEmailAction businessUnitSetContactEmailAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitSetContactEmailAction).isInstanceOf(BusinessUnitSetContactEmailAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { BusinessUnitSetContactEmailAction.builder().contactEmail("contactEmail") } };
+        return new Object[][] { new Object[] { "contactEmail",
+                BusinessUnitSetContactEmailAction.builder().contactEmail("contactEmail") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetCustomFieldActionTest.java
index 573e76d86c2..00168ef8db5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSetCustomFieldActionBuilder builder) {
         BusinessUnitSetCustomFieldAction businessUnitSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitSetCustomFieldAction).isInstanceOf(BusinessUnitSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitSetCustomFieldAction.builder().name("name") },
-                new Object[] { BusinessUnitSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", BusinessUnitSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", BusinessUnitSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetCustomTypeActionTest.java
index 2bac9195466..f692aaef3ca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSetCustomTypeActionBuilder builder) {
         BusinessUnitSetCustomTypeAction businessUnitSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitSetCustomTypeAction).isInstanceOf(BusinessUnitSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { BusinessUnitSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        BusinessUnitSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", BusinessUnitSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetDefaultBillingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetDefaultBillingAddressActionTest.java
index 56c5b5ad916..22e66139684 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetDefaultBillingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetDefaultBillingAddressActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSetDefaultBillingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSetDefaultBillingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSetDefaultBillingAddressActionBuilder builder) {
         BusinessUnitSetDefaultBillingAddressAction businessUnitSetDefaultBillingAddressAction = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitSetDefaultBillingAddressAction)
                 .isInstanceOf(BusinessUnitSetDefaultBillingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitSetDefaultBillingAddressAction.builder().addressId("addressId") },
-                new Object[] { BusinessUnitSetDefaultBillingAddressAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId",
+                        BusinessUnitSetDefaultBillingAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        BusinessUnitSetDefaultBillingAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetDefaultShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetDefaultShippingAddressActionTest.java
index f450694b380..f6856279bad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetDefaultShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetDefaultShippingAddressActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSetDefaultShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSetDefaultShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSetDefaultShippingAddressActionBuilder builder) {
         BusinessUnitSetDefaultShippingAddressAction businessUnitSetDefaultShippingAddressAction = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitSetDefaultShippingAddressAction)
                 .isInstanceOf(BusinessUnitSetDefaultShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitSetDefaultShippingAddressAction.builder().addressId("addressId") },
-                new Object[] { BusinessUnitSetDefaultShippingAddressAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId",
+                        BusinessUnitSetDefaultShippingAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        BusinessUnitSetDefaultShippingAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetStoreModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetStoreModeActionTest.java
index 9dcf2114c09..1c18c81b4ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetStoreModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetStoreModeActionTest.java
@@ -3,37 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSetStoreModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSetStoreModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSetStoreModeActionBuilder builder) {
         BusinessUnitSetStoreModeAction businessUnitSetStoreModeAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitSetStoreModeAction).isInstanceOf(BusinessUnitSetStoreModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "storeMode",
                         BusinessUnitSetStoreModeAction.builder()
                                 .storeMode(com.commercetools.api.models.business_unit.BusinessUnitStoreMode
                                         .findEnum("Explicit")) },
-                new Object[] { BusinessUnitSetStoreModeAction.builder()
-                        .stores(Collections.singletonList(
-                            new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) } };
+                new Object[] { "stores",
+                        BusinessUnitSetStoreModeAction.builder()
+                                .stores(Collections.singletonList(
+                                    new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetStoresActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetStoresActionTest.java
index b632db17a3c..bc16aaa5dbf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetStoresActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetStoresActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSetStoresActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSetStoresActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSetStoresActionBuilder builder) {
         BusinessUnitSetStoresAction businessUnitSetStoresAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitSetStoresAction).isInstanceOf(BusinessUnitSetStoresAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitSetStoresAction.builder()
-                .stores(Collections
-                        .singletonList(new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) } };
+        return new Object[][] { new Object[] { "stores",
+                BusinessUnitSetStoresAction.builder()
+                        .stores(Collections.singletonList(
+                            new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetUnitTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetUnitTypeActionTest.java
index cf7da8d9d53..9b5a95011ca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetUnitTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitSetUnitTypeActionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSetUnitTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSetUnitTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSetUnitTypeActionBuilder builder) {
         BusinessUnitSetUnitTypeAction businessUnitSetUnitTypeAction = builder.buildUnchecked();
         Assertions.assertThat(businessUnitSetUnitTypeAction).isInstanceOf(BusinessUnitSetUnitTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitSetUnitTypeAction.builder()
+                new Object[] { "unitType", BusinessUnitSetUnitTypeAction.builder()
                         .unitType(com.commercetools.api.models.business_unit.BusinessUnitType.findEnum("Company")) },
-                new Object[] { BusinessUnitSetUnitTypeAction.builder()
+                new Object[] { "parentUnit", BusinessUnitSetUnitTypeAction.builder()
                         .parentUnit(
                             new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitUpdateTest.java
index 88b4f5e7760..b79059f5cc1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/BusinessUnitUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitUpdateBuilder builder) {
         BusinessUnitUpdate businessUnitUpdate = builder.buildUnchecked();
         Assertions.assertThat(businessUnitUpdate).isInstanceOf(BusinessUnitUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitUpdate.builder().version(2L) },
-                new Object[] { BusinessUnitUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.business_unit.BusinessUnitUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", BusinessUnitUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        BusinessUnitUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.business_unit.BusinessUnitUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/CompanyDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/CompanyDraftTest.java
index e5c7130ece3..ef18d1cd9fd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/CompanyDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/CompanyDraftTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CompanyDraftTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/CompanyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/CompanyTest.java
index f24d30259c3..4214e176d94 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/CompanyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/CompanyTest.java
@@ -1,38 +1,31 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CompanyTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CompanyBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CompanyBuilder builder) {
         Company company = builder.buildUnchecked();
         Assertions.assertThat(company).isInstanceOf(Company.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "storeMode",
                         Company.builder()
                                 .storeMode(com.commercetools.api.models.business_unit.BusinessUnitStoreMode
                                         .findEnum("Explicit")) },
-                new Object[] { Company.builder()
-                        .associateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
-                                .findEnum("Explicit")) },
-                new Object[] { Company.builder()
+                new Object[] { "associateMode",
+                        Company.builder()
+                                .associateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
+                                        .findEnum("Explicit")) },
+                new Object[] { "approvalRuleMode", Company.builder()
                         .approvalRuleMode(com.commercetools.api.models.business_unit.BusinessUnitApprovalRuleMode
                                 .findEnum("Explicit")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/DivisionDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/DivisionDraftTest.java
index 6a643cd68d0..1861898f8ae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/DivisionDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/DivisionDraftTest.java
@@ -1,39 +1,32 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DivisionDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DivisionDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DivisionDraftBuilder builder) {
         DivisionDraft divisionDraft = builder.buildUnchecked();
         Assertions.assertThat(divisionDraft).isInstanceOf(DivisionDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DivisionDraft.builder()
+        return new Object[][] { new Object[] { "parentUnit", DivisionDraft.builder()
                 .parentUnit(new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) },
-                new Object[] {
+                new Object[] { "storeMode",
                         DivisionDraft.builder()
                                 .storeMode(com.commercetools.api.models.business_unit.BusinessUnitStoreMode
                                         .findEnum("Explicit")) },
-                new Object[] { DivisionDraft.builder()
-                        .associateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
-                                .findEnum("Explicit")) },
-                new Object[] { DivisionDraft.builder()
+                new Object[] { "associateMode",
+                        DivisionDraft.builder()
+                                .associateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
+                                        .findEnum("Explicit")) },
+                new Object[] { "approvalRuleMode", DivisionDraft.builder()
                         .approvalRuleMode(com.commercetools.api.models.business_unit.BusinessUnitApprovalRuleMode
                                 .findEnum("Explicit")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/DivisionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/DivisionTest.java
index d01558b9555..018d7c9fd87 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/DivisionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/DivisionTest.java
@@ -1,40 +1,33 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DivisionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DivisionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DivisionBuilder builder) {
         Division division = builder.buildUnchecked();
         Assertions.assertThat(division).isInstanceOf(Division.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { Division.builder()
+                new Object[] { "parentUnit", Division.builder()
                         .parentUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] {
+                new Object[] { "storeMode",
                         Division.builder()
                                 .storeMode(com.commercetools.api.models.business_unit.BusinessUnitStoreMode
                                         .findEnum("Explicit")) },
-                new Object[] { Division.builder()
-                        .associateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
-                                .findEnum("Explicit")) },
-                new Object[] { Division.builder()
+                new Object[] { "associateMode",
+                        Division.builder()
+                                .associateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
+                                        .findEnum("Explicit")) },
+                new Object[] { "approvalRuleMode", Division.builder()
                         .approvalRuleMode(com.commercetools.api.models.business_unit.BusinessUnitApprovalRuleMode
                                 .findEnum("Explicit")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/InheritedAssociateRoleAssignmentTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/InheritedAssociateRoleAssignmentTest.java
index f6ebcda9a2c..4a8b4876566 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/InheritedAssociateRoleAssignmentTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/InheritedAssociateRoleAssignmentTest.java
@@ -1,32 +1,27 @@
 
 package com.commercetools.api.models.business_unit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InheritedAssociateRoleAssignmentTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InheritedAssociateRoleAssignmentBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InheritedAssociateRoleAssignmentBuilder builder) {
         InheritedAssociateRoleAssignment inheritedAssociateRoleAssignment = builder.buildUnchecked();
         Assertions.assertThat(inheritedAssociateRoleAssignment).isInstanceOf(InheritedAssociateRoleAssignment.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InheritedAssociateRoleAssignment.builder()
-                .associateRole(new com.commercetools.api.models.associate_role.AssociateRoleKeyReferenceImpl()) },
-                new Object[] { InheritedAssociateRoleAssignment.builder()
+        return new Object[][] {
+                new Object[] { "associateRole",
+                        InheritedAssociateRoleAssignment.builder()
+                                .associateRole(
+                                    new com.commercetools.api.models.associate_role.AssociateRoleKeyReferenceImpl()) },
+                new Object[] { "source", InheritedAssociateRoleAssignment.builder()
                         .source(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/InheritedAssociateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/InheritedAssociateTest.java
index 614b5faa02e..7eb790fdec7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/InheritedAssociateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit/InheritedAssociateTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InheritedAssociateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InheritedAssociateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InheritedAssociateBuilder builder) {
         InheritedAssociate inheritedAssociate = builder.buildUnchecked();
         Assertions.assertThat(inheritedAssociate).isInstanceOf(InheritedAssociate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { InheritedAssociate.builder()
+                new Object[] { "associateRoleAssignments", InheritedAssociate.builder()
                         .associateRoleAssignments(Collections.singletonList(
                             new com.commercetools.api.models.business_unit.InheritedAssociateRoleAssignmentImpl())) },
-                new Object[] { InheritedAssociate.builder()
+                new Object[] { "customer", InheritedAssociate.builder()
                         .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitIndexingProgressTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitIndexingProgressTest.java
index 696ae138bbb..adfff9bca33 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitIndexingProgressTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitIndexingProgressTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.business_unit_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitIndexingProgressTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitIndexingProgressBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitIndexingProgressBuilder builder) {
         BusinessUnitIndexingProgress businessUnitIndexingProgress = builder.buildUnchecked();
         Assertions.assertThat(businessUnitIndexingProgress).isInstanceOf(BusinessUnitIndexingProgress.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitIndexingProgress.builder().indexed(4) },
-                new Object[] { BusinessUnitIndexingProgress.builder().failed(9) },
-                new Object[] { BusinessUnitIndexingProgress.builder().estimatedTotal(9) } };
+        return new Object[][] { new Object[] { "indexed", BusinessUnitIndexingProgress.builder().indexed(4) },
+                new Object[] { "failed", BusinessUnitIndexingProgress.builder().failed(9) },
+                new Object[] { "estimatedTotal", BusinessUnitIndexingProgress.builder().estimatedTotal(9) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitPagedSearchResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitPagedSearchResponseTest.java
index 61163641c2d..407a18e17d4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitPagedSearchResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitPagedSearchResponseTest.java
@@ -3,33 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitPagedSearchResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitPagedSearchResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitPagedSearchResponseBuilder builder) {
         BusinessUnitPagedSearchResponse businessUnitPagedSearchResponse = builder.buildUnchecked();
         Assertions.assertThat(businessUnitPagedSearchResponse).isInstanceOf(BusinessUnitPagedSearchResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitPagedSearchResponse.builder().total(1L) },
-                new Object[] { BusinessUnitPagedSearchResponse.builder().limit(7) },
-                new Object[] { BusinessUnitPagedSearchResponse.builder().offset(3) },
-                new Object[] { BusinessUnitPagedSearchResponse.builder()
+        return new Object[][] { new Object[] { "total", BusinessUnitPagedSearchResponse.builder().total(1L) },
+                new Object[] { "limit", BusinessUnitPagedSearchResponse.builder().limit(7) },
+                new Object[] { "offset", BusinessUnitPagedSearchResponse.builder().offset(3) },
+                new Object[] { "results", BusinessUnitPagedSearchResponse.builder()
                         .results(Collections.singletonList(
                             new com.commercetools.api.models.business_unit_search.BusinessUnitSearchResultImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitSearchIndexingStatusResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitSearchIndexingStatusResponseTest.java
index 77980b268e2..21e4b50dba4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitSearchIndexingStatusResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitSearchIndexingStatusResponseTest.java
@@ -3,43 +3,37 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSearchIndexingStatusResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSearchIndexingStatusResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSearchIndexingStatusResponseBuilder builder) {
         BusinessUnitSearchIndexingStatusResponse businessUnitSearchIndexingStatusResponse = builder.buildUnchecked();
         Assertions.assertThat(businessUnitSearchIndexingStatusResponse)
                 .isInstanceOf(BusinessUnitSearchIndexingStatusResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "status",
                         BusinessUnitSearchIndexingStatusResponse.builder()
                                 .status(com.commercetools.api.models.project.BusinessUnitIndexingStatus
                                         .findEnum("Scheduled")) },
-                new Object[] { BusinessUnitSearchIndexingStatusResponse.builder()
+                new Object[] { "states", BusinessUnitSearchIndexingStatusResponse.builder()
                         .states(
                             new com.commercetools.api.models.business_unit_search.BusinessUnitIndexingProgressImpl()) },
-                new Object[] { BusinessUnitSearchIndexingStatusResponse.builder()
-                        .startedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { BusinessUnitSearchIndexingStatusResponse.builder()
-                        .lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { BusinessUnitSearchIndexingStatusResponse.builder().retryCount(7) } };
+                new Object[] { "startedAt",
+                        BusinessUnitSearchIndexingStatusResponse.builder()
+                                .startedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        BusinessUnitSearchIndexingStatusResponse.builder()
+                                .lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "retryCount", BusinessUnitSearchIndexingStatusResponse.builder().retryCount(7) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitSearchRequestTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitSearchRequestTest.java
index 977c4cb7541..50a58042dbc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitSearchRequestTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitSearchRequestTest.java
@@ -3,36 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSearchRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSearchRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSearchRequestBuilder builder) {
         BusinessUnitSearchRequest businessUnitSearchRequest = builder.buildUnchecked();
         Assertions.assertThat(businessUnitSearchRequest).isInstanceOf(BusinessUnitSearchRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitSearchRequest.builder()
-                        .query(new com.commercetools.api.models.search.SearchQueryImpl()) },
-                new Object[] { BusinessUnitSearchRequest.builder()
-                        .sort(Collections.singletonList(new com.commercetools.api.models.search.SearchSortingImpl())) },
-                new Object[] { BusinessUnitSearchRequest.builder().limit(7) },
-                new Object[] { BusinessUnitSearchRequest.builder().offset(3) } };
+                new Object[] { "query",
+                        BusinessUnitSearchRequest.builder()
+                                .query(new com.commercetools.api.models.search.SearchQueryImpl()) },
+                new Object[] { "sort",
+                        BusinessUnitSearchRequest.builder()
+                                .sort(Collections
+                                        .singletonList(new com.commercetools.api.models.search.SearchSortingImpl())) },
+                new Object[] { "limit", BusinessUnitSearchRequest.builder().limit(7) },
+                new Object[] { "offset", BusinessUnitSearchRequest.builder().offset(3) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitSearchResultTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitSearchResultTest.java
index eaaa6d2caad..019c0cd5e6d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitSearchResultTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/business_unit_search/BusinessUnitSearchResultTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.business_unit_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitSearchResultTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitSearchResultBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitSearchResultBuilder builder) {
         BusinessUnitSearchResult businessUnitSearchResult = builder.buildUnchecked();
         Assertions.assertThat(businessUnitSearchResult).isInstanceOf(BusinessUnitSearchResult.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitSearchResult.builder().id("id") },
-                new Object[] { BusinessUnitSearchResult.builder().relevance(0.5586561) } };
+        return new Object[][] { new Object[] { "id", BusinessUnitSearchResult.builder().id("id") },
+                new Object[] { "relevance", BusinessUnitSearchResult.builder().relevance(0.5586561) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/BestDealTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/BestDealTest.java
index de10a70b55d..6492b40cae1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/BestDealTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/BestDealTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BestDealTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BestDealBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BestDealBuilder builder) {
         BestDeal bestDeal = builder.buildUnchecked();
         Assertions.assertThat(bestDeal).isInstanceOf(BestDeal.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BestDeal.builder().chosenDiscountType("chosenDiscountType") } };
+        return new Object[][] {
+                new Object[] { "chosenDiscountType", BestDeal.builder().chosenDiscountType("chosenDiscountType") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddCustomLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddCustomLineItemActionTest.java
index f66e9c30a81..3e584463c07 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddCustomLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddCustomLineItemActionTest.java
@@ -1,47 +1,43 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartAddCustomLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartAddCustomLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartAddCustomLineItemActionBuilder builder) {
         CartAddCustomLineItemAction cartAddCustomLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(cartAddCustomLineItemAction).isInstanceOf(CartAddCustomLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartAddCustomLineItemAction.builder()
-                        .money(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { CartAddCustomLineItemAction.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CartAddCustomLineItemAction.builder().key("key") },
-                new Object[] { CartAddCustomLineItemAction.builder().quantity(8L) },
-                new Object[] { CartAddCustomLineItemAction.builder().slug("slug") },
-                new Object[] { CartAddCustomLineItemAction.builder()
+                new Object[] { "money",
+                        CartAddCustomLineItemAction.builder()
+                                .money(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "name",
+                        CartAddCustomLineItemAction.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "key", CartAddCustomLineItemAction.builder().key("key") },
+                new Object[] { "quantity", CartAddCustomLineItemAction.builder().quantity(8L) },
+                new Object[] { "slug", CartAddCustomLineItemAction.builder().slug("slug") },
+                new Object[] { "taxCategory", CartAddCustomLineItemAction.builder()
                         .taxCategory(
                             new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) },
-                new Object[] { CartAddCustomLineItemAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { CartAddCustomLineItemAction.builder()
+                new Object[] { "externalTaxRate",
+                        CartAddCustomLineItemAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "shippingDetails", CartAddCustomLineItemAction.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) },
-                new Object[] { CartAddCustomLineItemAction.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { CartAddCustomLineItemAction.builder()
+                new Object[] { "custom",
+                        CartAddCustomLineItemAction.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "priceMode", CartAddCustomLineItemAction.builder()
                         .priceMode(com.commercetools.api.models.cart.CustomLineItemPriceMode.findEnum("Standard")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddCustomShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddCustomShippingMethodActionTest.java
index 2ea216e403f..3fffabe3c00 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddCustomShippingMethodActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddCustomShippingMethodActionTest.java
@@ -3,47 +3,43 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartAddCustomShippingMethodActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartAddCustomShippingMethodActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartAddCustomShippingMethodActionBuilder builder) {
         CartAddCustomShippingMethodAction cartAddCustomShippingMethodAction = builder.buildUnchecked();
         Assertions.assertThat(cartAddCustomShippingMethodAction).isInstanceOf(CartAddCustomShippingMethodAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartAddCustomShippingMethodAction.builder().shippingKey("shippingKey") },
-                new Object[] { CartAddCustomShippingMethodAction.builder().shippingMethodName("shippingMethodName") },
-                new Object[] { CartAddCustomShippingMethodAction.builder()
-                        .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { CartAddCustomShippingMethodAction.builder()
+        return new Object[][] {
+                new Object[] { "shippingKey", CartAddCustomShippingMethodAction.builder().shippingKey("shippingKey") },
+                new Object[] { "shippingMethodName",
+                        CartAddCustomShippingMethodAction.builder().shippingMethodName("shippingMethodName") },
+                new Object[] { "shippingAddress",
+                        CartAddCustomShippingMethodAction.builder()
+                                .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "shippingRate", CartAddCustomShippingMethodAction.builder()
                         .shippingRate(new com.commercetools.api.models.shipping_method.ShippingRateDraftImpl()) },
-                new Object[] { CartAddCustomShippingMethodAction.builder()
+                new Object[] { "shippingRateInput", CartAddCustomShippingMethodAction.builder()
                         .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputDraftImpl()) },
-                new Object[] { CartAddCustomShippingMethodAction.builder()
+                new Object[] { "taxCategory", CartAddCustomShippingMethodAction.builder()
                         .taxCategory(
                             new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) },
-                new Object[] { CartAddCustomShippingMethodAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] {
+                new Object[] { "externalTaxRate",
+                        CartAddCustomShippingMethodAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "deliveries",
                         CartAddCustomShippingMethodAction.builder()
                                 .deliveries(Collections
                                         .singletonList(new com.commercetools.api.models.order.DeliveryDraftImpl())) },
-                new Object[] { CartAddCustomShippingMethodAction.builder()
+                new Object[] { "custom", CartAddCustomShippingMethodAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddDiscountCodeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddDiscountCodeActionTest.java
index 165f6d65979..68539462987 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddDiscountCodeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddDiscountCodeActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartAddDiscountCodeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartAddDiscountCodeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartAddDiscountCodeActionBuilder builder) {
         CartAddDiscountCodeAction cartAddDiscountCodeAction = builder.buildUnchecked();
         Assertions.assertThat(cartAddDiscountCodeAction).isInstanceOf(CartAddDiscountCodeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartAddDiscountCodeAction.builder().code("code") } };
+        return new Object[][] { new Object[] { "code", CartAddDiscountCodeAction.builder().code("code") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddItemShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddItemShippingAddressActionTest.java
index 28a8b05a3a0..2ed3cbb6306 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddItemShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddItemShippingAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartAddItemShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartAddItemShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartAddItemShippingAddressActionBuilder builder) {
         CartAddItemShippingAddressAction cartAddItemShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(cartAddItemShippingAddressAction).isInstanceOf(CartAddItemShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartAddItemShippingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", CartAddItemShippingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddLineItemActionTest.java
index ec0f0fd8a6d..416e0218fb7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddLineItemActionTest.java
@@ -4,54 +4,52 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartAddLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartAddLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartAddLineItemActionBuilder builder) {
         CartAddLineItemAction cartAddLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(cartAddLineItemAction).isInstanceOf(CartAddLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartAddLineItemAction.builder().key("key") },
-                new Object[] { CartAddLineItemAction.builder().productId("productId") },
-                new Object[] { CartAddLineItemAction.builder().variantId(5L) },
-                new Object[] { CartAddLineItemAction.builder().sku("sku") },
-                new Object[] { CartAddLineItemAction.builder().quantity(8L) },
-                new Object[] { CartAddLineItemAction.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CartAddLineItemAction.builder()
-                        .distributionChannel(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { CartAddLineItemAction.builder()
+        return new Object[][] { new Object[] { "key", CartAddLineItemAction.builder().key("key") },
+                new Object[] { "productId", CartAddLineItemAction.builder().productId("productId") },
+                new Object[] { "variantId", CartAddLineItemAction.builder().variantId(5L) },
+                new Object[] { "sku", CartAddLineItemAction.builder().sku("sku") },
+                new Object[] { "quantity", CartAddLineItemAction.builder().quantity(8L) },
+                new Object[] { "addedAt",
+                        CartAddLineItemAction.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "distributionChannel",
+                        CartAddLineItemAction.builder()
+                                .distributionChannel(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "supplyChannel", CartAddLineItemAction.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { CartAddLineItemAction.builder()
-                        .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { CartAddLineItemAction.builder()
+                new Object[] { "externalPrice",
+                        CartAddLineItemAction.builder()
+                                .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "externalTotalPrice", CartAddLineItemAction.builder()
                         .externalTotalPrice(new com.commercetools.api.models.cart.ExternalLineItemTotalPriceImpl()) },
-                new Object[] { CartAddLineItemAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { CartAddLineItemAction.builder()
-                        .perMethodExternalTaxRate(Collections.singletonList(
-                            new com.commercetools.api.models.cart.MethodExternalTaxRateDraftImpl())) },
-                new Object[] { CartAddLineItemAction.builder()
-                        .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
-                new Object[] { CartAddLineItemAction.builder()
+                new Object[] { "externalTaxRate",
+                        CartAddLineItemAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "perMethodExternalTaxRate",
+                        CartAddLineItemAction.builder()
+                                .perMethodExternalTaxRate(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.MethodExternalTaxRateDraftImpl())) },
+                new Object[] { "inventoryMode",
+                        CartAddLineItemAction.builder()
+                                .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
+                new Object[] { "shippingDetails", CartAddLineItemAction.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) },
-                new Object[] { CartAddLineItemAction.builder()
+                new Object[] { "custom", CartAddLineItemAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddPaymentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddPaymentActionTest.java
index 15eb5c719cf..9b8e20dd743 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddPaymentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddPaymentActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartAddPaymentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartAddPaymentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartAddPaymentActionBuilder builder) {
         CartAddPaymentAction cartAddPaymentAction = builder.buildUnchecked();
         Assertions.assertThat(cartAddPaymentAction).isInstanceOf(CartAddPaymentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartAddPaymentAction.builder()
+        return new Object[][] { new Object[] { "payment", CartAddPaymentAction.builder()
                 .payment(new com.commercetools.api.models.payment.PaymentResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddShippingMethodActionTest.java
index 4d7dccf9ee4..fd0af336211 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddShippingMethodActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddShippingMethodActionTest.java
@@ -3,44 +3,39 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartAddShippingMethodActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartAddShippingMethodActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartAddShippingMethodActionBuilder builder) {
         CartAddShippingMethodAction cartAddShippingMethodAction = builder.buildUnchecked();
         Assertions.assertThat(cartAddShippingMethodAction).isInstanceOf(CartAddShippingMethodAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartAddShippingMethodAction.builder().shippingKey("shippingKey") },
-                new Object[] { CartAddShippingMethodAction.builder()
+        return new Object[][] {
+                new Object[] { "shippingKey", CartAddShippingMethodAction.builder().shippingKey("shippingKey") },
+                new Object[] { "shippingMethod", CartAddShippingMethodAction.builder()
                         .shippingMethod(
                             new com.commercetools.api.models.shipping_method.ShippingMethodResourceIdentifierImpl()) },
-                new Object[] { CartAddShippingMethodAction.builder()
-                        .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { CartAddShippingMethodAction.builder()
+                new Object[] { "shippingAddress",
+                        CartAddShippingMethodAction.builder()
+                                .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "shippingRateInput", CartAddShippingMethodAction.builder()
                         .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputDraftImpl()) },
-                new Object[] { CartAddShippingMethodAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] {
+                new Object[] { "externalTaxRate",
+                        CartAddShippingMethodAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "deliveries",
                         CartAddShippingMethodAction.builder()
                                 .deliveries(Collections
                                         .singletonList(new com.commercetools.api.models.order.DeliveryDraftImpl())) },
-                new Object[] { CartAddShippingMethodAction.builder()
+                new Object[] { "custom", CartAddShippingMethodAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddShoppingListActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddShoppingListActionTest.java
index f0c8c263d92..83ce9a2b3cd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddShoppingListActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartAddShoppingListActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartAddShoppingListActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartAddShoppingListActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartAddShoppingListActionBuilder builder) {
         CartAddShoppingListAction cartAddShoppingListAction = builder.buildUnchecked();
         Assertions.assertThat(cartAddShoppingListAction).isInstanceOf(CartAddShoppingListAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartAddShoppingListAction.builder()
+        return new Object[][] { new Object[] { "shoppingList", CartAddShoppingListAction.builder()
                 .shoppingList(new com.commercetools.api.models.shopping_list.ShoppingListResourceIdentifierImpl()) },
-                new Object[] { CartAddShoppingListAction.builder()
-                        .distributionChannel(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { CartAddShoppingListAction.builder()
+                new Object[] { "distributionChannel",
+                        CartAddShoppingListAction.builder()
+                                .distributionChannel(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "supplyChannel", CartAddShoppingListAction.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartApplyDeltaToCustomLineItemShippingDetailsTargetsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartApplyDeltaToCustomLineItemShippingDetailsTargetsActionTest.java
index 2ed08e9f580..a5d020ca9d3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartApplyDeltaToCustomLineItemShippingDetailsTargetsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartApplyDeltaToCustomLineItemShippingDetailsTargetsActionTest.java
@@ -3,39 +3,34 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartApplyDeltaToCustomLineItemShippingDetailsTargetsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartApplyDeltaToCustomLineItemShippingDetailsTargetsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartApplyDeltaToCustomLineItemShippingDetailsTargetsActionBuilder builder) {
         CartApplyDeltaToCustomLineItemShippingDetailsTargetsAction cartApplyDeltaToCustomLineItemShippingDetailsTargetsAction = builder
                 .buildUnchecked();
         Assertions.assertThat(cartApplyDeltaToCustomLineItemShippingDetailsTargetsAction)
                 .isInstanceOf(CartApplyDeltaToCustomLineItemShippingDetailsTargetsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartApplyDeltaToCustomLineItemShippingDetailsTargetsAction.builder()
-                        .customLineItemId("customLineItemId") },
-                new Object[] { CartApplyDeltaToCustomLineItemShippingDetailsTargetsAction.builder()
-                        .customLineItemKey("customLineItemKey") },
-                new Object[] { CartApplyDeltaToCustomLineItemShippingDetailsTargetsAction.builder()
-                        .targetsDelta(Collections
-                                .singletonList(new com.commercetools.api.models.cart.ItemShippingTargetImpl())) } };
+                new Object[] { "customLineItemId",
+                        CartApplyDeltaToCustomLineItemShippingDetailsTargetsAction.builder()
+                                .customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
+                        CartApplyDeltaToCustomLineItemShippingDetailsTargetsAction.builder()
+                                .customLineItemKey("customLineItemKey") },
+                new Object[] { "targetsDelta",
+                        CartApplyDeltaToCustomLineItemShippingDetailsTargetsAction.builder()
+                                .targetsDelta(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.ItemShippingTargetImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartApplyDeltaToLineItemShippingDetailsTargetsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartApplyDeltaToLineItemShippingDetailsTargetsActionTest.java
index 056c4bad477..93c549c8a69 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartApplyDeltaToLineItemShippingDetailsTargetsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartApplyDeltaToLineItemShippingDetailsTargetsActionTest.java
@@ -3,39 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartApplyDeltaToLineItemShippingDetailsTargetsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartApplyDeltaToLineItemShippingDetailsTargetsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartApplyDeltaToLineItemShippingDetailsTargetsActionBuilder builder) {
         CartApplyDeltaToLineItemShippingDetailsTargetsAction cartApplyDeltaToLineItemShippingDetailsTargetsAction = builder
                 .buildUnchecked();
         Assertions.assertThat(cartApplyDeltaToLineItemShippingDetailsTargetsAction)
                 .isInstanceOf(CartApplyDeltaToLineItemShippingDetailsTargetsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "lineItemId",
                         CartApplyDeltaToLineItemShippingDetailsTargetsAction.builder().lineItemId("lineItemId") },
-                new Object[] {
+                new Object[] { "lineItemKey",
                         CartApplyDeltaToLineItemShippingDetailsTargetsAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartApplyDeltaToLineItemShippingDetailsTargetsAction.builder()
-                        .targetsDelta(Collections
-                                .singletonList(new com.commercetools.api.models.cart.ItemShippingTargetImpl())) } };
+                new Object[] { "targetsDelta",
+                        CartApplyDeltaToLineItemShippingDetailsTargetsAction.builder()
+                                .targetsDelta(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.ItemShippingTargetImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeCustomLineItemMoneyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeCustomLineItemMoneyActionTest.java
index 67f3a182a43..d4787839e1e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeCustomLineItemMoneyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeCustomLineItemMoneyActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartChangeCustomLineItemMoneyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartChangeCustomLineItemMoneyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartChangeCustomLineItemMoneyActionBuilder builder) {
         CartChangeCustomLineItemMoneyAction cartChangeCustomLineItemMoneyAction = builder.buildUnchecked();
         Assertions.assertThat(cartChangeCustomLineItemMoneyAction)
                 .isInstanceOf(CartChangeCustomLineItemMoneyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartChangeCustomLineItemMoneyAction.builder().customLineItemId("customLineItemId") },
-                new Object[] { CartChangeCustomLineItemMoneyAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { CartChangeCustomLineItemMoneyAction.builder()
+                new Object[] { "customLineItemId",
+                        CartChangeCustomLineItemMoneyAction.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
+                        CartChangeCustomLineItemMoneyAction.builder().customLineItemKey("customLineItemKey") },
+                new Object[] { "money", CartChangeCustomLineItemMoneyAction.builder()
                         .money(new com.commercetools.api.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeCustomLineItemPriceModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeCustomLineItemPriceModeActionTest.java
index 143464813d5..4b7dafb7148 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeCustomLineItemPriceModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeCustomLineItemPriceModeActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartChangeCustomLineItemPriceModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartChangeCustomLineItemPriceModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartChangeCustomLineItemPriceModeActionBuilder builder) {
         CartChangeCustomLineItemPriceModeAction cartChangeCustomLineItemPriceModeAction = builder.buildUnchecked();
         Assertions.assertThat(cartChangeCustomLineItemPriceModeAction)
                 .isInstanceOf(CartChangeCustomLineItemPriceModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartChangeCustomLineItemPriceModeAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemId",
+                        CartChangeCustomLineItemPriceModeAction.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
                         CartChangeCustomLineItemPriceModeAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { CartChangeCustomLineItemPriceModeAction.builder()
+                new Object[] { "mode", CartChangeCustomLineItemPriceModeAction.builder()
                         .mode(com.commercetools.api.models.cart.CustomLineItemPriceMode.findEnum("Standard")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeCustomLineItemQuantityActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeCustomLineItemQuantityActionTest.java
index 2cdc20371f0..efe760f0d85 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeCustomLineItemQuantityActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeCustomLineItemQuantityActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartChangeCustomLineItemQuantityActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartChangeCustomLineItemQuantityActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartChangeCustomLineItemQuantityActionBuilder builder) {
         CartChangeCustomLineItemQuantityAction cartChangeCustomLineItemQuantityAction = builder.buildUnchecked();
         Assertions.assertThat(cartChangeCustomLineItemQuantityAction)
                 .isInstanceOf(CartChangeCustomLineItemQuantityAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartChangeCustomLineItemQuantityAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemId",
+                        CartChangeCustomLineItemQuantityAction.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
                         CartChangeCustomLineItemQuantityAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { CartChangeCustomLineItemQuantityAction.builder().quantity(8L) } };
+                new Object[] { "quantity", CartChangeCustomLineItemQuantityAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeLineItemQuantityActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeLineItemQuantityActionTest.java
index 9a375018114..e4a9098a374 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeLineItemQuantityActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeLineItemQuantityActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartChangeLineItemQuantityActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartChangeLineItemQuantityActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartChangeLineItemQuantityActionBuilder builder) {
         CartChangeLineItemQuantityAction cartChangeLineItemQuantityAction = builder.buildUnchecked();
         Assertions.assertThat(cartChangeLineItemQuantityAction).isInstanceOf(CartChangeLineItemQuantityAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartChangeLineItemQuantityAction.builder().lineItemId("lineItemId") },
-                new Object[] { CartChangeLineItemQuantityAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartChangeLineItemQuantityAction.builder().quantity(8L) },
-                new Object[] { CartChangeLineItemQuantityAction.builder()
-                        .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { CartChangeLineItemQuantityAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", CartChangeLineItemQuantityAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", CartChangeLineItemQuantityAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "quantity", CartChangeLineItemQuantityAction.builder().quantity(8L) },
+                new Object[] { "externalPrice",
+                        CartChangeLineItemQuantityAction.builder()
+                                .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "externalTotalPrice", CartChangeLineItemQuantityAction.builder()
                         .externalTotalPrice(new com.commercetools.api.models.cart.ExternalLineItemTotalPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeLineItemsOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeLineItemsOrderActionTest.java
index d6cf2b10385..254ecb6cacd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeLineItemsOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeLineItemsOrderActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartChangeLineItemsOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartChangeLineItemsOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartChangeLineItemsOrderActionBuilder builder) {
         CartChangeLineItemsOrderAction cartChangeLineItemsOrderAction = builder.buildUnchecked();
         Assertions.assertThat(cartChangeLineItemsOrderAction).isInstanceOf(CartChangeLineItemsOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "lineItemOrder",
                 CartChangeLineItemsOrderAction.builder().lineItemOrder(Collections.singletonList("lineItemOrder")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeTaxCalculationModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeTaxCalculationModeActionTest.java
index 7222ba2c60e..c7302e1021b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeTaxCalculationModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeTaxCalculationModeActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartChangeTaxCalculationModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartChangeTaxCalculationModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartChangeTaxCalculationModeActionBuilder builder) {
         CartChangeTaxCalculationModeAction cartChangeTaxCalculationModeAction = builder.buildUnchecked();
         Assertions.assertThat(cartChangeTaxCalculationModeAction)
                 .isInstanceOf(CartChangeTaxCalculationModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartChangeTaxCalculationModeAction.builder()
+        return new Object[][] { new Object[] { "taxCalculationMode", CartChangeTaxCalculationModeAction.builder()
                 .taxCalculationMode(com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeTaxModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeTaxModeActionTest.java
index 9ce61848ac0..3989b6099fe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeTaxModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeTaxModeActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartChangeTaxModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartChangeTaxModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartChangeTaxModeActionBuilder builder) {
         CartChangeTaxModeAction cartChangeTaxModeAction = builder.buildUnchecked();
         Assertions.assertThat(cartChangeTaxModeAction).isInstanceOf(CartChangeTaxModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartChangeTaxModeAction.builder()
+        return new Object[][] { new Object[] { "taxMode", CartChangeTaxModeAction.builder()
                 .taxMode(com.commercetools.api.models.cart.TaxMode.findEnum("Platform")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeTaxRoundingModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeTaxRoundingModeActionTest.java
index d45643fe243..d1f27820a7e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeTaxRoundingModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartChangeTaxRoundingModeActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartChangeTaxRoundingModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartChangeTaxRoundingModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartChangeTaxRoundingModeActionBuilder builder) {
         CartChangeTaxRoundingModeAction cartChangeTaxRoundingModeAction = builder.buildUnchecked();
         Assertions.assertThat(cartChangeTaxRoundingModeAction).isInstanceOf(CartChangeTaxRoundingModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartChangeTaxRoundingModeAction.builder()
+        return new Object[][] { new Object[] { "taxRoundingMode", CartChangeTaxRoundingModeAction.builder()
                 .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartDraftTest.java
index 596c0799013..0988cd7bcaa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartDraftTest.java
@@ -3,89 +3,93 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDraftBuilder builder) {
         CartDraft cartDraft = builder.buildUnchecked();
         Assertions.assertThat(cartDraft).isInstanceOf(CartDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDraft.builder().currency("currency") },
-                new Object[] { CartDraft.builder().key("key") },
-                new Object[] { CartDraft.builder().customerId("customerId") },
-                new Object[] { CartDraft.builder().customerEmail("customerEmail") },
-                new Object[] { CartDraft.builder()
+        return new Object[][] { new Object[] { "currency", CartDraft.builder().currency("currency") },
+                new Object[] { "key", CartDraft.builder().key("key") },
+                new Object[] { "customerId", CartDraft.builder().customerId("customerId") },
+                new Object[] { "customerEmail", CartDraft.builder().customerEmail("customerEmail") },
+                new Object[] { "customerGroup", CartDraft.builder()
                         .customerGroup(
                             new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) },
-                new Object[] { CartDraft.builder().anonymousId("anonymousId") },
-                new Object[] { CartDraft.builder()
+                new Object[] { "anonymousId", CartDraft.builder().anonymousId("anonymousId") },
+                new Object[] { "businessUnit", CartDraft.builder()
                         .businessUnit(
                             new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) },
-                new Object[] { CartDraft.builder()
-                        .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) },
-                new Object[] {
+                new Object[] { "store",
+                        CartDraft.builder()
+                                .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) },
+                new Object[] { "lineItems",
                         CartDraft.builder()
                                 .lineItems(Collections
                                         .singletonList(new com.commercetools.api.models.cart.LineItemDraftImpl())) },
-                new Object[] { CartDraft.builder()
-                        .customLineItems(Collections
-                                .singletonList(new com.commercetools.api.models.cart.CustomLineItemDraftImpl())) },
-                new Object[] {
+                new Object[] { "customLineItems",
+                        CartDraft.builder()
+                                .customLineItems(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.CustomLineItemDraftImpl())) },
+                new Object[] { "taxMode",
                         CartDraft.builder().taxMode(com.commercetools.api.models.cart.TaxMode.findEnum("Platform")) },
-                new Object[] { CartDraft.builder()
-                        .externalTaxRateForShippingMethod(
-                            new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { CartDraft.builder()
-                        .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) },
-                new Object[] { CartDraft.builder()
-                        .taxCalculationMode(
-                            com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) },
-                new Object[] { CartDraft.builder()
-                        .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
-                new Object[] {
+                new Object[] { "externalTaxRateForShippingMethod",
+                        CartDraft.builder()
+                                .externalTaxRateForShippingMethod(
+                                    new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "taxRoundingMode",
+                        CartDraft.builder()
+                                .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) },
+                new Object[] { "taxCalculationMode",
+                        CartDraft.builder()
+                                .taxCalculationMode(
+                                    com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) },
+                new Object[] { "inventoryMode",
+                        CartDraft.builder()
+                                .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
+                new Object[] { "billingAddress",
                         CartDraft.builder().billingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { CartDraft.builder()
-                        .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { CartDraft.builder()
+                new Object[] { "shippingAddress",
+                        CartDraft.builder()
+                                .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "shippingMethod", CartDraft.builder()
                         .shippingMethod(
                             new com.commercetools.api.models.shipping_method.ShippingMethodResourceIdentifierImpl()) },
-                new Object[] { CartDraft.builder()
+                new Object[] { "shippingRateInput", CartDraft.builder()
                         .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputDraftImpl()) },
-                new Object[] { CartDraft.builder()
-                        .shippingMode(com.commercetools.api.models.cart.ShippingMode.findEnum("Single")) },
-                new Object[] { CartDraft.builder()
-                        .customShipping(Collections
-                                .singletonList(new com.commercetools.api.models.cart.CustomShippingDraftImpl())) },
-                new Object[] {
+                new Object[] { "shippingMode",
+                        CartDraft.builder()
+                                .shippingMode(com.commercetools.api.models.cart.ShippingMode.findEnum("Single")) },
+                new Object[] { "customShipping",
+                        CartDraft.builder()
+                                .customShipping(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.CustomShippingDraftImpl())) },
+                new Object[] { "shipping",
                         CartDraft.builder()
                                 .shipping(Collections
                                         .singletonList(new com.commercetools.api.models.cart.ShippingDraftImpl())) },
-                new Object[] {
+                new Object[] { "itemShippingAddresses",
                         CartDraft.builder()
                                 .itemShippingAddresses(Collections
                                         .singletonList(new com.commercetools.api.models.common.BaseAddressImpl())) },
-                new Object[] { CartDraft.builder().discountCodes(Collections.singletonList("discountCodes")) },
-                new Object[] { CartDraft.builder().country("country") },
-                new Object[] { CartDraft.builder().locale("locale") },
-                new Object[] {
+                new Object[] { "discountCodes",
+                        CartDraft.builder().discountCodes(Collections.singletonList("discountCodes")) },
+                new Object[] { "country", CartDraft.builder().country("country") },
+                new Object[] { "locale", CartDraft.builder().locale("locale") },
+                new Object[] { "origin",
                         CartDraft.builder().origin(com.commercetools.api.models.cart.CartOrigin.findEnum("Customer")) },
-                new Object[] { CartDraft.builder().deleteDaysAfterLastModification(3L) }, new Object[] {
+                new Object[] { "deleteDaysAfterLastModification",
+                        CartDraft.builder().deleteDaysAfterLastModification(3L) },
+                new Object[] { "custom",
                         CartDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartFreezeCartActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartFreezeCartActionTest.java
index a4c2626e200..24833da4960 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartFreezeCartActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartFreezeCartActionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartFreezeCartActionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartPagedQueryResponseTest.java
index affba8fbccb..d669ec04196 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartPagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartPagedQueryResponseBuilder builder) {
         CartPagedQueryResponse cartPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(cartPagedQueryResponse).isInstanceOf(CartPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartPagedQueryResponse.builder().limit(7L) },
-                new Object[] { CartPagedQueryResponse.builder().offset(3L) },
-                new Object[] { CartPagedQueryResponse.builder().count(2L) },
-                new Object[] { CartPagedQueryResponse.builder().total(1L) },
-                new Object[] { CartPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", CartPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", CartPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", CartPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", CartPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", CartPagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.cart.CartImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRecalculateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRecalculateActionTest.java
index c321b60424d..b0a04d9782c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRecalculateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRecalculateActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartRecalculateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartRecalculateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartRecalculateActionBuilder builder) {
         CartRecalculateAction cartRecalculateAction = builder.buildUnchecked();
         Assertions.assertThat(cartRecalculateAction).isInstanceOf(CartRecalculateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartRecalculateAction.builder().updateProductData(true) } };
+        return new Object[][] {
+                new Object[] { "updateProductData", CartRecalculateAction.builder().updateProductData(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartReferenceTest.java
index 82bc8b95878..006a5cc76a5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartReferenceTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartReferenceBuilder builder) {
         CartReference cartReference = builder.buildUnchecked();
         Assertions.assertThat(cartReference).isInstanceOf(CartReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartReference.builder().obj(new com.commercetools.api.models.cart.CartImpl()) },
-                new Object[] { CartReference.builder().id("id") } };
+                new Object[] { "obj", CartReference.builder().obj(new com.commercetools.api.models.cart.CartImpl()) },
+                new Object[] { "id", CartReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveCustomLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveCustomLineItemActionTest.java
index d14066f23a9..d57406c6a8d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveCustomLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveCustomLineItemActionTest.java
@@ -1,32 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartRemoveCustomLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartRemoveCustomLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartRemoveCustomLineItemActionBuilder builder) {
         CartRemoveCustomLineItemAction cartRemoveCustomLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(cartRemoveCustomLineItemAction).isInstanceOf(CartRemoveCustomLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartRemoveCustomLineItemAction.builder().customLineItemId("customLineItemId") },
-                new Object[] { CartRemoveCustomLineItemAction.builder().customLineItemKey("customLineItemKey") } };
+                new Object[] { "customLineItemId",
+                        CartRemoveCustomLineItemAction.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
+                        CartRemoveCustomLineItemAction.builder().customLineItemKey("customLineItemKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveDiscountCodeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveDiscountCodeActionTest.java
index 4533ee3a34c..16a4df48140 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveDiscountCodeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveDiscountCodeActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartRemoveDiscountCodeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartRemoveDiscountCodeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartRemoveDiscountCodeActionBuilder builder) {
         CartRemoveDiscountCodeAction cartRemoveDiscountCodeAction = builder.buildUnchecked();
         Assertions.assertThat(cartRemoveDiscountCodeAction).isInstanceOf(CartRemoveDiscountCodeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartRemoveDiscountCodeAction.builder()
+        return new Object[][] { new Object[] { "discountCode", CartRemoveDiscountCodeAction.builder()
                 .discountCode(new com.commercetools.api.models.discount_code.DiscountCodeReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveItemShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveItemShippingAddressActionTest.java
index 720bb6e03e7..3f4a94d9b08 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveItemShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveItemShippingAddressActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartRemoveItemShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartRemoveItemShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartRemoveItemShippingAddressActionBuilder builder) {
         CartRemoveItemShippingAddressAction cartRemoveItemShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(cartRemoveItemShippingAddressAction)
                 .isInstanceOf(CartRemoveItemShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartRemoveItemShippingAddressAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressKey", CartRemoveItemShippingAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveLineItemActionTest.java
index 2515a62b2c5..8a304d4f9d6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveLineItemActionTest.java
@@ -1,39 +1,34 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartRemoveLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartRemoveLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartRemoveLineItemActionBuilder builder) {
         CartRemoveLineItemAction cartRemoveLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(cartRemoveLineItemAction).isInstanceOf(CartRemoveLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartRemoveLineItemAction.builder().lineItemId("lineItemId") },
-                new Object[] { CartRemoveLineItemAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartRemoveLineItemAction.builder().quantity(8L) },
-                new Object[] { CartRemoveLineItemAction.builder()
-                        .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { CartRemoveLineItemAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", CartRemoveLineItemAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", CartRemoveLineItemAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "quantity", CartRemoveLineItemAction.builder().quantity(8L) },
+                new Object[] { "externalPrice",
+                        CartRemoveLineItemAction.builder()
+                                .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "externalTotalPrice", CartRemoveLineItemAction.builder()
                         .externalTotalPrice(new com.commercetools.api.models.cart.ExternalLineItemTotalPriceImpl()) },
-                new Object[] { CartRemoveLineItemAction.builder()
-                        .shippingDetailsToRemove(
-                            new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
+                new Object[] { "shippingDetailsToRemove",
+                        CartRemoveLineItemAction.builder()
+                                .shippingDetailsToRemove(
+                                    new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemovePaymentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemovePaymentActionTest.java
index 79e6cd73005..175bd96590e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemovePaymentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemovePaymentActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartRemovePaymentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartRemovePaymentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartRemovePaymentActionBuilder builder) {
         CartRemovePaymentAction cartRemovePaymentAction = builder.buildUnchecked();
         Assertions.assertThat(cartRemovePaymentAction).isInstanceOf(CartRemovePaymentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartRemovePaymentAction.builder()
+        return new Object[][] { new Object[] { "payment", CartRemovePaymentAction.builder()
                 .payment(new com.commercetools.api.models.payment.PaymentResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveShippingMethodActionTest.java
index d2c9ca7f986..a8f02526abc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveShippingMethodActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartRemoveShippingMethodActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartRemoveShippingMethodActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartRemoveShippingMethodActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartRemoveShippingMethodActionBuilder builder) {
         CartRemoveShippingMethodAction cartRemoveShippingMethodAction = builder.buildUnchecked();
         Assertions.assertThat(cartRemoveShippingMethodAction).isInstanceOf(CartRemoveShippingMethodAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartRemoveShippingMethodAction.builder().shippingKey("shippingKey") } };
+        return new Object[][] {
+                new Object[] { "shippingKey", CartRemoveShippingMethodAction.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartResourceIdentifierTest.java
index a2cd40efee8..72638451f21 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartResourceIdentifierBuilder builder) {
         CartResourceIdentifier cartResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(cartResourceIdentifier).isInstanceOf(CartResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartResourceIdentifier.builder().id("id") },
-                new Object[] { CartResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", CartResourceIdentifier.builder().id("id") },
+                new Object[] { "key", CartResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetAnonymousIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetAnonymousIdActionTest.java
index 31f3fe48c2b..1ecdf421bcc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetAnonymousIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetAnonymousIdActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetAnonymousIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetAnonymousIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetAnonymousIdActionBuilder builder) {
         CartSetAnonymousIdAction cartSetAnonymousIdAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetAnonymousIdAction).isInstanceOf(CartSetAnonymousIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetAnonymousIdAction.builder().anonymousId("anonymousId") } };
+        return new Object[][] {
+                new Object[] { "anonymousId", CartSetAnonymousIdAction.builder().anonymousId("anonymousId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBillingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBillingAddressActionTest.java
index f5ad2ea0747..9cfc7ee71ea 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBillingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBillingAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetBillingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetBillingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetBillingAddressActionBuilder builder) {
         CartSetBillingAddressAction cartSetBillingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetBillingAddressAction).isInstanceOf(CartSetBillingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetBillingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", CartSetBillingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBillingAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBillingAddressCustomFieldActionTest.java
index 7b64733cc13..67b382d6af0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBillingAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBillingAddressCustomFieldActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetBillingAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetBillingAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetBillingAddressCustomFieldActionBuilder builder) {
         CartSetBillingAddressCustomFieldAction cartSetBillingAddressCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetBillingAddressCustomFieldAction)
                 .isInstanceOf(CartSetBillingAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetBillingAddressCustomFieldAction.builder().name("name") },
-                new Object[] { CartSetBillingAddressCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", CartSetBillingAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CartSetBillingAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBillingAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBillingAddressCustomTypeActionTest.java
index d4be4e30e69..4f382208601 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBillingAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBillingAddressCustomTypeActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetBillingAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetBillingAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetBillingAddressCustomTypeActionBuilder builder) {
         CartSetBillingAddressCustomTypeAction cartSetBillingAddressCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetBillingAddressCustomTypeAction)
                 .isInstanceOf(CartSetBillingAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetBillingAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CartSetBillingAddressCustomTypeAction.builder()
+                new Object[] { "type",
+                        CartSetBillingAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CartSetBillingAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBusinessUnitActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBusinessUnitActionTest.java
index fea93f113d1..7c461f7bc59 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBusinessUnitActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetBusinessUnitActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetBusinessUnitActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetBusinessUnitActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetBusinessUnitActionBuilder builder) {
         CartSetBusinessUnitAction cartSetBusinessUnitAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetBusinessUnitAction).isInstanceOf(CartSetBusinessUnitAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetBusinessUnitAction.builder()
+        return new Object[][] { new Object[] { "businessUnit", CartSetBusinessUnitAction.builder()
                 .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCartTotalTaxActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCartTotalTaxActionTest.java
index 8d3299c95c7..c36afa94305 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCartTotalTaxActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCartTotalTaxActionTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCartTotalTaxActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCartTotalTaxActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCartTotalTaxActionBuilder builder) {
         CartSetCartTotalTaxAction cartSetCartTotalTaxAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetCartTotalTaxAction).isInstanceOf(CartSetCartTotalTaxAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetCartTotalTaxAction.builder()
-                        .externalTotalGross(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { CartSetCartTotalTaxAction.builder()
+                new Object[] { "externalTotalGross",
+                        CartSetCartTotalTaxAction.builder()
+                                .externalTotalGross(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "externalTaxPortions", CartSetCartTotalTaxAction.builder()
                         .externalTaxPortions(
                             Collections.singletonList(new com.commercetools.api.models.cart.TaxPortionDraftImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCountryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCountryActionTest.java
index edf61a1542e..92bd8521741 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCountryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCountryActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCountryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCountryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCountryActionBuilder builder) {
         CartSetCountryAction cartSetCountryAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetCountryAction).isInstanceOf(CartSetCountryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetCountryAction.builder().country("country") } };
+        return new Object[][] { new Object[] { "country", CartSetCountryAction.builder().country("country") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomFieldActionTest.java
index a29cc1e1122..c521b73a448 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCustomFieldActionBuilder builder) {
         CartSetCustomFieldAction cartSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetCustomFieldAction).isInstanceOf(CartSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetCustomFieldAction.builder().name("name") },
-                new Object[] { CartSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", CartSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CartSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemCustomFieldActionTest.java
index 5e0f37f53f0..dee6ebc1e11 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemCustomFieldActionTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCustomLineItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCustomLineItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCustomLineItemCustomFieldActionBuilder builder) {
         CartSetCustomLineItemCustomFieldAction cartSetCustomLineItemCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetCustomLineItemCustomFieldAction)
                 .isInstanceOf(CartSetCustomLineItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetCustomLineItemCustomFieldAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemId",
+                        CartSetCustomLineItemCustomFieldAction.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
                         CartSetCustomLineItemCustomFieldAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { CartSetCustomLineItemCustomFieldAction.builder().name("name") },
-                new Object[] { CartSetCustomLineItemCustomFieldAction.builder().value("value") } };
+                new Object[] { "name", CartSetCustomLineItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CartSetCustomLineItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemCustomTypeActionTest.java
index bf19db7c65b..b1a9c10f75c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemCustomTypeActionTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCustomLineItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCustomLineItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCustomLineItemCustomTypeActionBuilder builder) {
         CartSetCustomLineItemCustomTypeAction cartSetCustomLineItemCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetCustomLineItemCustomTypeAction)
                 .isInstanceOf(CartSetCustomLineItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetCustomLineItemCustomTypeAction.builder().customLineItemId("customLineItemId") },
-                new Object[] { CartSetCustomLineItemCustomTypeAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { CartSetCustomLineItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CartSetCustomLineItemCustomTypeAction.builder()
+                new Object[] { "customLineItemId",
+                        CartSetCustomLineItemCustomTypeAction.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
+                        CartSetCustomLineItemCustomTypeAction.builder().customLineItemKey("customLineItemKey") },
+                new Object[] { "type",
+                        CartSetCustomLineItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CartSetCustomLineItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemShippingDetailsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemShippingDetailsActionTest.java
index 2ac56255292..befb5b81254 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemShippingDetailsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemShippingDetailsActionTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCustomLineItemShippingDetailsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCustomLineItemShippingDetailsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCustomLineItemShippingDetailsActionBuilder builder) {
         CartSetCustomLineItemShippingDetailsAction cartSetCustomLineItemShippingDetailsAction = builder
                 .buildUnchecked();
         Assertions.assertThat(cartSetCustomLineItemShippingDetailsAction)
                 .isInstanceOf(CartSetCustomLineItemShippingDetailsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         CartSetCustomLineItemShippingDetailsAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemKey",
                         CartSetCustomLineItemShippingDetailsAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { CartSetCustomLineItemShippingDetailsAction.builder()
+                new Object[] { "shippingDetails", CartSetCustomLineItemShippingDetailsAction.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemTaxAmountActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemTaxAmountActionTest.java
index 4cf53c76495..47f727b0ddf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemTaxAmountActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemTaxAmountActionTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCustomLineItemTaxAmountActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCustomLineItemTaxAmountActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCustomLineItemTaxAmountActionBuilder builder) {
         CartSetCustomLineItemTaxAmountAction cartSetCustomLineItemTaxAmountAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetCustomLineItemTaxAmountAction)
                 .isInstanceOf(CartSetCustomLineItemTaxAmountAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetCustomLineItemTaxAmountAction.builder().customLineItemId("customLineItemId") },
-                new Object[] { CartSetCustomLineItemTaxAmountAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { CartSetCustomLineItemTaxAmountAction.builder()
+                new Object[] { "customLineItemId",
+                        CartSetCustomLineItemTaxAmountAction.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
+                        CartSetCustomLineItemTaxAmountAction.builder().customLineItemKey("customLineItemKey") },
+                new Object[] { "externalTaxAmount", CartSetCustomLineItemTaxAmountAction.builder()
                         .externalTaxAmount(new com.commercetools.api.models.cart.ExternalTaxAmountDraftImpl()) },
-                new Object[] { CartSetCustomLineItemTaxAmountAction.builder().shippingKey("shippingKey") } };
+                new Object[] { "shippingKey",
+                        CartSetCustomLineItemTaxAmountAction.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemTaxRateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemTaxRateActionTest.java
index 9aadafef324..b73e6974dba 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemTaxRateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomLineItemTaxRateActionTest.java
@@ -1,36 +1,32 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCustomLineItemTaxRateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCustomLineItemTaxRateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCustomLineItemTaxRateActionBuilder builder) {
         CartSetCustomLineItemTaxRateAction cartSetCustomLineItemTaxRateAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetCustomLineItemTaxRateAction)
                 .isInstanceOf(CartSetCustomLineItemTaxRateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetCustomLineItemTaxRateAction.builder().customLineItemId("customLineItemId") },
-                new Object[] { CartSetCustomLineItemTaxRateAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { CartSetCustomLineItemTaxRateAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { CartSetCustomLineItemTaxRateAction.builder().shippingKey("shippingKey") } };
+                new Object[] { "customLineItemId",
+                        CartSetCustomLineItemTaxRateAction.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
+                        CartSetCustomLineItemTaxRateAction.builder().customLineItemKey("customLineItemKey") },
+                new Object[] { "externalTaxRate",
+                        CartSetCustomLineItemTaxRateAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "shippingKey",
+                        CartSetCustomLineItemTaxRateAction.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionTest.java
index a94a4ccec1d..0e42022ff31 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomShippingMethodActionTest.java
@@ -1,39 +1,33 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCustomShippingMethodActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCustomShippingMethodActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCustomShippingMethodActionBuilder builder) {
         CartSetCustomShippingMethodAction cartSetCustomShippingMethodAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetCustomShippingMethodAction).isInstanceOf(CartSetCustomShippingMethodAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetCustomShippingMethodAction.builder().shippingMethodName("shippingMethodName") },
-                new Object[] { CartSetCustomShippingMethodAction.builder()
+                new Object[] { "shippingMethodName",
+                        CartSetCustomShippingMethodAction.builder().shippingMethodName("shippingMethodName") },
+                new Object[] { "shippingRate", CartSetCustomShippingMethodAction.builder()
                         .shippingRate(new com.commercetools.api.models.shipping_method.ShippingRateDraftImpl()) },
-                new Object[] { CartSetCustomShippingMethodAction.builder()
+                new Object[] { "taxCategory", CartSetCustomShippingMethodAction.builder()
                         .taxCategory(
                             new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) },
-                new Object[] { CartSetCustomShippingMethodAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { CartSetCustomShippingMethodAction.builder()
+                new Object[] { "externalTaxRate",
+                        CartSetCustomShippingMethodAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "custom", CartSetCustomShippingMethodAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomTypeActionTest.java
index 4740836fdd5..c86a63079bd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCustomTypeActionBuilder builder) {
         CartSetCustomTypeAction cartSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetCustomTypeAction).isInstanceOf(CartSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CartSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        CartSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CartSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomerEmailActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomerEmailActionTest.java
index fe6424cd93f..ccf50cc8aab 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomerEmailActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomerEmailActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCustomerEmailActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCustomerEmailActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCustomerEmailActionBuilder builder) {
         CartSetCustomerEmailAction cartSetCustomerEmailAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetCustomerEmailAction).isInstanceOf(CartSetCustomerEmailAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetCustomerEmailAction.builder().email("email") } };
+        return new Object[][] { new Object[] { "email", CartSetCustomerEmailAction.builder().email("email") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomerGroupActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomerGroupActionTest.java
index 188f795614d..eb892301fe3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomerGroupActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomerGroupActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCustomerGroupActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCustomerGroupActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCustomerGroupActionBuilder builder) {
         CartSetCustomerGroupAction cartSetCustomerGroupAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetCustomerGroupAction).isInstanceOf(CartSetCustomerGroupAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetCustomerGroupAction.builder()
-                .customerGroup(
-                    new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) } };
+        return new Object[][] { new Object[] { "customerGroup",
+                CartSetCustomerGroupAction.builder()
+                        .customerGroup(
+                            new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomerIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomerIdActionTest.java
index 3964d86769f..d3e728a4b4f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomerIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetCustomerIdActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetCustomerIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetCustomerIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetCustomerIdActionBuilder builder) {
         CartSetCustomerIdAction cartSetCustomerIdAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetCustomerIdAction).isInstanceOf(CartSetCustomerIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetCustomerIdAction.builder().customerId("customerId") } };
+        return new Object[][] {
+                new Object[] { "customerId", CartSetCustomerIdAction.builder().customerId("customerId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetDeleteDaysAfterLastModificationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetDeleteDaysAfterLastModificationActionTest.java
index 4bf3c650826..0be73a6691a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetDeleteDaysAfterLastModificationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetDeleteDaysAfterLastModificationActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetDeleteDaysAfterLastModificationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetDeleteDaysAfterLastModificationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetDeleteDaysAfterLastModificationActionBuilder builder) {
         CartSetDeleteDaysAfterLastModificationAction cartSetDeleteDaysAfterLastModificationAction = builder
                 .buildUnchecked();
         Assertions.assertThat(cartSetDeleteDaysAfterLastModificationAction)
                 .isInstanceOf(CartSetDeleteDaysAfterLastModificationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "deleteDaysAfterLastModification",
                 CartSetDeleteDaysAfterLastModificationAction.builder().deleteDaysAfterLastModification(3) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetDirectDiscountsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetDirectDiscountsActionTest.java
index d05d94bfea5..b6ab101efc3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetDirectDiscountsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetDirectDiscountsActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetDirectDiscountsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetDirectDiscountsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetDirectDiscountsActionBuilder builder) {
         CartSetDirectDiscountsAction cartSetDirectDiscountsAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetDirectDiscountsAction).isInstanceOf(CartSetDirectDiscountsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetDirectDiscountsAction.builder()
+        return new Object[][] { new Object[] { "discounts", CartSetDirectDiscountsAction.builder()
                 .discounts(
                     Collections.singletonList(new com.commercetools.api.models.cart.DirectDiscountDraftImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetItemShippingAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetItemShippingAddressCustomFieldActionTest.java
index ecabdfe668f..d6c9419cea6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetItemShippingAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetItemShippingAddressCustomFieldActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetItemShippingAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetItemShippingAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetItemShippingAddressCustomFieldActionBuilder builder) {
         CartSetItemShippingAddressCustomFieldAction cartSetItemShippingAddressCustomFieldAction = builder
                 .buildUnchecked();
         Assertions.assertThat(cartSetItemShippingAddressCustomFieldAction)
                 .isInstanceOf(CartSetItemShippingAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetItemShippingAddressCustomFieldAction.builder().addressKey("addressKey") },
-                new Object[] { CartSetItemShippingAddressCustomFieldAction.builder().name("name") },
-                new Object[] { CartSetItemShippingAddressCustomFieldAction.builder().value("value") } };
+                new Object[] { "addressKey",
+                        CartSetItemShippingAddressCustomFieldAction.builder().addressKey("addressKey") },
+                new Object[] { "name", CartSetItemShippingAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CartSetItemShippingAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetItemShippingAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetItemShippingAddressCustomTypeActionTest.java
index 81d2cd594d1..e0dfbcc68c2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetItemShippingAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetItemShippingAddressCustomTypeActionTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetItemShippingAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetItemShippingAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetItemShippingAddressCustomTypeActionBuilder builder) {
         CartSetItemShippingAddressCustomTypeAction cartSetItemShippingAddressCustomTypeAction = builder
                 .buildUnchecked();
         Assertions.assertThat(cartSetItemShippingAddressCustomTypeAction)
                 .isInstanceOf(CartSetItemShippingAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetItemShippingAddressCustomTypeAction.builder().addressKey("addressKey") },
-                new Object[] { CartSetItemShippingAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CartSetItemShippingAddressCustomTypeAction.builder()
+                new Object[] { "addressKey",
+                        CartSetItemShippingAddressCustomTypeAction.builder().addressKey("addressKey") },
+                new Object[] { "type",
+                        CartSetItemShippingAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CartSetItemShippingAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetKeyActionTest.java
index 7c2c2cf2fd0..06fbf38fb46 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetKeyActionBuilder builder) {
         CartSetKeyAction cartSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetKeyAction).isInstanceOf(CartSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", CartSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemCustomFieldActionTest.java
index 8586b893772..e013d5ca1e1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemCustomFieldActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetLineItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetLineItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetLineItemCustomFieldActionBuilder builder) {
         CartSetLineItemCustomFieldAction cartSetLineItemCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetLineItemCustomFieldAction).isInstanceOf(CartSetLineItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetLineItemCustomFieldAction.builder().lineItemId("lineItemId") },
-                new Object[] { CartSetLineItemCustomFieldAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartSetLineItemCustomFieldAction.builder().name("name") },
-                new Object[] { CartSetLineItemCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "lineItemId", CartSetLineItemCustomFieldAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", CartSetLineItemCustomFieldAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "name", CartSetLineItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CartSetLineItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemCustomTypeActionTest.java
index 82650f8c38e..a02a6b3c3be 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemCustomTypeActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetLineItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetLineItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetLineItemCustomTypeActionBuilder builder) {
         CartSetLineItemCustomTypeAction cartSetLineItemCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetLineItemCustomTypeAction).isInstanceOf(CartSetLineItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetLineItemCustomTypeAction.builder().lineItemId("lineItemId") },
-                new Object[] { CartSetLineItemCustomTypeAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartSetLineItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CartSetLineItemCustomTypeAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", CartSetLineItemCustomTypeAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", CartSetLineItemCustomTypeAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "type",
+                        CartSetLineItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CartSetLineItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemDistributionChannelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemDistributionChannelActionTest.java
index e422a68b1e7..39322e2269f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemDistributionChannelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemDistributionChannelActionTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetLineItemDistributionChannelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetLineItemDistributionChannelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetLineItemDistributionChannelActionBuilder builder) {
         CartSetLineItemDistributionChannelAction cartSetLineItemDistributionChannelAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetLineItemDistributionChannelAction)
                 .isInstanceOf(CartSetLineItemDistributionChannelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetLineItemDistributionChannelAction.builder().lineItemId("lineItemId") },
-                new Object[] { CartSetLineItemDistributionChannelAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartSetLineItemDistributionChannelAction.builder()
-                        .distributionChannel(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
+                new Object[] { "lineItemId",
+                        CartSetLineItemDistributionChannelAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        CartSetLineItemDistributionChannelAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "distributionChannel",
+                        CartSetLineItemDistributionChannelAction.builder()
+                                .distributionChannel(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemInventoryModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemInventoryModeActionTest.java
index 8e976768c18..bdeb1dc7d9d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemInventoryModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemInventoryModeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetLineItemInventoryModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetLineItemInventoryModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetLineItemInventoryModeActionBuilder builder) {
         CartSetLineItemInventoryModeAction cartSetLineItemInventoryModeAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetLineItemInventoryModeAction)
                 .isInstanceOf(CartSetLineItemInventoryModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetLineItemInventoryModeAction.builder().lineItemId("lineItemId") },
-                new Object[] { CartSetLineItemInventoryModeAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartSetLineItemInventoryModeAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", CartSetLineItemInventoryModeAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", CartSetLineItemInventoryModeAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "inventoryMode", CartSetLineItemInventoryModeAction.builder()
                         .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemPriceActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemPriceActionTest.java
index a611ec11d18..9a86f3fbd36 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemPriceActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemPriceActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetLineItemPriceActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetLineItemPriceActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetLineItemPriceActionBuilder builder) {
         CartSetLineItemPriceAction cartSetLineItemPriceAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetLineItemPriceAction).isInstanceOf(CartSetLineItemPriceAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetLineItemPriceAction.builder().lineItemId("lineItemId") },
-                new Object[] { CartSetLineItemPriceAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartSetLineItemPriceAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", CartSetLineItemPriceAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", CartSetLineItemPriceAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "externalPrice", CartSetLineItemPriceAction.builder()
                         .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemShippingDetailsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemShippingDetailsActionTest.java
index f34e168dda8..ef496e3d8a3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemShippingDetailsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemShippingDetailsActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetLineItemShippingDetailsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetLineItemShippingDetailsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetLineItemShippingDetailsActionBuilder builder) {
         CartSetLineItemShippingDetailsAction cartSetLineItemShippingDetailsAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetLineItemShippingDetailsAction)
                 .isInstanceOf(CartSetLineItemShippingDetailsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetLineItemShippingDetailsAction.builder().lineItemId("lineItemId") },
-                new Object[] { CartSetLineItemShippingDetailsAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartSetLineItemShippingDetailsAction.builder()
+                new Object[] { "lineItemId", CartSetLineItemShippingDetailsAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        CartSetLineItemShippingDetailsAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "shippingDetails", CartSetLineItemShippingDetailsAction.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemSupplyChannelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemSupplyChannelActionTest.java
index b97e1aa2e85..82cdaf0a9b2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemSupplyChannelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemSupplyChannelActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetLineItemSupplyChannelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetLineItemSupplyChannelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetLineItemSupplyChannelActionBuilder builder) {
         CartSetLineItemSupplyChannelAction cartSetLineItemSupplyChannelAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetLineItemSupplyChannelAction)
                 .isInstanceOf(CartSetLineItemSupplyChannelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetLineItemSupplyChannelAction.builder().lineItemId("lineItemId") },
-                new Object[] { CartSetLineItemSupplyChannelAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartSetLineItemSupplyChannelAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", CartSetLineItemSupplyChannelAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", CartSetLineItemSupplyChannelAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "supplyChannel", CartSetLineItemSupplyChannelAction.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemTaxAmountActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemTaxAmountActionTest.java
index 07192ad14aa..639c231e2df 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemTaxAmountActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemTaxAmountActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetLineItemTaxAmountActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetLineItemTaxAmountActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetLineItemTaxAmountActionBuilder builder) {
         CartSetLineItemTaxAmountAction cartSetLineItemTaxAmountAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetLineItemTaxAmountAction).isInstanceOf(CartSetLineItemTaxAmountAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetLineItemTaxAmountAction.builder().lineItemId("lineItemId") },
-                new Object[] { CartSetLineItemTaxAmountAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartSetLineItemTaxAmountAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", CartSetLineItemTaxAmountAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", CartSetLineItemTaxAmountAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "externalTaxAmount", CartSetLineItemTaxAmountAction.builder()
                         .externalTaxAmount(new com.commercetools.api.models.cart.ExternalTaxAmountDraftImpl()) },
-                new Object[] { CartSetLineItemTaxAmountAction.builder().shippingKey("shippingKey") } };
+                new Object[] { "shippingKey", CartSetLineItemTaxAmountAction.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemTaxRateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemTaxRateActionTest.java
index 85d4fad138f..16e591b6f40 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemTaxRateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemTaxRateActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetLineItemTaxRateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetLineItemTaxRateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetLineItemTaxRateActionBuilder builder) {
         CartSetLineItemTaxRateAction cartSetLineItemTaxRateAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetLineItemTaxRateAction).isInstanceOf(CartSetLineItemTaxRateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetLineItemTaxRateAction.builder().lineItemId("lineItemId") },
-                new Object[] { CartSetLineItemTaxRateAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartSetLineItemTaxRateAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { CartSetLineItemTaxRateAction.builder().shippingKey("shippingKey") } };
+        return new Object[][] {
+                new Object[] { "lineItemId", CartSetLineItemTaxRateAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", CartSetLineItemTaxRateAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "externalTaxRate",
+                        CartSetLineItemTaxRateAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "shippingKey", CartSetLineItemTaxRateAction.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemTotalPriceActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemTotalPriceActionTest.java
index dfad820a744..4a3ea0a7b3b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemTotalPriceActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLineItemTotalPriceActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetLineItemTotalPriceActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetLineItemTotalPriceActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetLineItemTotalPriceActionBuilder builder) {
         CartSetLineItemTotalPriceAction cartSetLineItemTotalPriceAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetLineItemTotalPriceAction).isInstanceOf(CartSetLineItemTotalPriceAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetLineItemTotalPriceAction.builder().lineItemId("lineItemId") },
-                new Object[] { CartSetLineItemTotalPriceAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { CartSetLineItemTotalPriceAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", CartSetLineItemTotalPriceAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", CartSetLineItemTotalPriceAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "externalTotalPrice", CartSetLineItemTotalPriceAction.builder()
                         .externalTotalPrice(new com.commercetools.api.models.cart.ExternalLineItemTotalPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLocaleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLocaleActionTest.java
index 60a2b6e6591..dd5b60b6279 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLocaleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetLocaleActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetLocaleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetLocaleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetLocaleActionBuilder builder) {
         CartSetLocaleAction cartSetLocaleAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetLocaleAction).isInstanceOf(CartSetLocaleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetLocaleAction.builder().locale("locale") } };
+        return new Object[][] { new Object[] { "locale", CartSetLocaleAction.builder().locale("locale") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingAddressActionTest.java
index 1bcdc059f5a..adcd575f55b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetShippingAddressActionBuilder builder) {
         CartSetShippingAddressAction cartSetShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetShippingAddressAction).isInstanceOf(CartSetShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetShippingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", CartSetShippingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingAddressCustomFieldActionTest.java
index 38242522276..25722186287 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingAddressCustomFieldActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetShippingAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetShippingAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetShippingAddressCustomFieldActionBuilder builder) {
         CartSetShippingAddressCustomFieldAction cartSetShippingAddressCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetShippingAddressCustomFieldAction)
                 .isInstanceOf(CartSetShippingAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetShippingAddressCustomFieldAction.builder().name("name") },
-                new Object[] { CartSetShippingAddressCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", CartSetShippingAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CartSetShippingAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingAddressCustomTypeActionTest.java
index 8f34162ef07..4dc6f41c50c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingAddressCustomTypeActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetShippingAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetShippingAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetShippingAddressCustomTypeActionBuilder builder) {
         CartSetShippingAddressCustomTypeAction cartSetShippingAddressCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetShippingAddressCustomTypeAction)
                 .isInstanceOf(CartSetShippingAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetShippingAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CartSetShippingAddressCustomTypeAction.builder()
+                new Object[] { "type",
+                        CartSetShippingAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CartSetShippingAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingCustomFieldActionTest.java
index d3f83821f3b..09dcc41bc0f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingCustomFieldActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetShippingCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetShippingCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetShippingCustomFieldActionBuilder builder) {
         CartSetShippingCustomFieldAction cartSetShippingCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetShippingCustomFieldAction).isInstanceOf(CartSetShippingCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetShippingCustomFieldAction.builder().shippingKey("shippingKey") },
-                new Object[] { CartSetShippingCustomFieldAction.builder().name("name") },
-                new Object[] { CartSetShippingCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "shippingKey", CartSetShippingCustomFieldAction.builder().shippingKey("shippingKey") },
+                new Object[] { "name", CartSetShippingCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CartSetShippingCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingCustomTypeActionTest.java
index a79c898ac39..3ee374bd728 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingCustomTypeActionTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetShippingCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetShippingCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetShippingCustomTypeActionBuilder builder) {
         CartSetShippingCustomTypeAction cartSetShippingCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetShippingCustomTypeAction).isInstanceOf(CartSetShippingCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetShippingCustomTypeAction.builder().shippingKey("shippingKey") },
-                new Object[] { CartSetShippingCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CartSetShippingCustomTypeAction.builder()
+        return new Object[][] {
+                new Object[] { "shippingKey", CartSetShippingCustomTypeAction.builder().shippingKey("shippingKey") },
+                new Object[] { "type",
+                        CartSetShippingCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CartSetShippingCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingMethodActionTest.java
index fe48b21053a..6a3877d4792 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingMethodActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingMethodActionTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetShippingMethodActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetShippingMethodActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetShippingMethodActionBuilder builder) {
         CartSetShippingMethodAction cartSetShippingMethodAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetShippingMethodAction).isInstanceOf(CartSetShippingMethodAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetShippingMethodAction.builder()
+                new Object[] { "shippingMethod", CartSetShippingMethodAction.builder()
                         .shippingMethod(
                             new com.commercetools.api.models.shipping_method.ShippingMethodResourceIdentifierImpl()) },
-                new Object[] { CartSetShippingMethodAction.builder()
+                new Object[] { "externalTaxRate", CartSetShippingMethodAction.builder()
                         .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingMethodTaxAmountActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingMethodTaxAmountActionTest.java
index 9684dc129b5..240cb72fb32 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingMethodTaxAmountActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingMethodTaxAmountActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetShippingMethodTaxAmountActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetShippingMethodTaxAmountActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetShippingMethodTaxAmountActionBuilder builder) {
         CartSetShippingMethodTaxAmountAction cartSetShippingMethodTaxAmountAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetShippingMethodTaxAmountAction)
                 .isInstanceOf(CartSetShippingMethodTaxAmountAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetShippingMethodTaxAmountAction.builder().shippingKey("shippingKey") },
-                new Object[] { CartSetShippingMethodTaxAmountAction.builder()
+                new Object[] { "shippingKey",
+                        CartSetShippingMethodTaxAmountAction.builder().shippingKey("shippingKey") },
+                new Object[] { "externalTaxAmount", CartSetShippingMethodTaxAmountAction.builder()
                         .externalTaxAmount(new com.commercetools.api.models.cart.ExternalTaxAmountDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingMethodTaxRateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingMethodTaxRateActionTest.java
index 08183141d5a..1a5a1fef1a8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingMethodTaxRateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingMethodTaxRateActionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetShippingMethodTaxRateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetShippingMethodTaxRateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetShippingMethodTaxRateActionBuilder builder) {
         CartSetShippingMethodTaxRateAction cartSetShippingMethodTaxRateAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetShippingMethodTaxRateAction)
                 .isInstanceOf(CartSetShippingMethodTaxRateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartSetShippingMethodTaxRateAction.builder().shippingKey("shippingKey") },
-                new Object[] { CartSetShippingMethodTaxRateAction.builder()
+                new Object[] { "shippingKey", CartSetShippingMethodTaxRateAction.builder().shippingKey("shippingKey") },
+                new Object[] { "externalTaxRate", CartSetShippingMethodTaxRateAction.builder()
                         .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingRateInputActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingRateInputActionTest.java
index 2a5e4a64425..dabccba5768 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingRateInputActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartSetShippingRateInputActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartSetShippingRateInputActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartSetShippingRateInputActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartSetShippingRateInputActionBuilder builder) {
         CartSetShippingRateInputAction cartSetShippingRateInputAction = builder.buildUnchecked();
         Assertions.assertThat(cartSetShippingRateInputAction).isInstanceOf(CartSetShippingRateInputAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartSetShippingRateInputAction.builder()
+        return new Object[][] { new Object[] { "shippingRateInput", CartSetShippingRateInputAction.builder()
                 .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartTest.java
index 5d0e7e4ff54..5db30e10030 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartTest.java
@@ -4,101 +4,113 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartBuilder builder) {
         Cart cart = builder.buildUnchecked();
         Assertions.assertThat(cart).isInstanceOf(Cart.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Cart.builder().id("id") }, new Object[] { Cart.builder().version(2L) },
-                new Object[] { Cart.builder().key("key") }, new Object[] { Cart.builder().customerId("customerId") },
-                new Object[] { Cart.builder().customerEmail("customerEmail") },
-                new Object[] { Cart.builder()
+        return new Object[][] { new Object[] { "id", Cart.builder().id("id") },
+                new Object[] { "version", Cart.builder().version(2L) },
+                new Object[] { "key", Cart.builder().key("key") },
+                new Object[] { "customerId", Cart.builder().customerId("customerId") },
+                new Object[] { "customerEmail", Cart.builder().customerEmail("customerEmail") },
+                new Object[] { "customerGroup", Cart.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] { Cart.builder().anonymousId("anonymousId") },
-                new Object[] { Cart.builder()
+                new Object[] { "anonymousId", Cart.builder().anonymousId("anonymousId") },
+                new Object[] { "businessUnit", Cart.builder()
                         .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { Cart.builder().store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { Cart.builder()
+                new Object[] { "store",
+                        Cart.builder().store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "lineItems", Cart.builder()
                         .lineItems(Collections.singletonList(new com.commercetools.api.models.cart.LineItemImpl())) },
-                new Object[] {
+                new Object[] { "customLineItems",
                         Cart.builder()
                                 .customLineItems(Collections
                                         .singletonList(new com.commercetools.api.models.cart.CustomLineItemImpl())) },
-                new Object[] { Cart.builder().totalLineItemQuantity(6L) },
-                new Object[] {
+                new Object[] { "totalLineItemQuantity", Cart.builder().totalLineItemQuantity(6L) },
+                new Object[] { "totalPrice",
                         Cart.builder().totalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { Cart.builder().taxedPrice(new com.commercetools.api.models.cart.TaxedPriceImpl()) },
-                new Object[] {
+                new Object[] { "taxedPrice",
+                        Cart.builder().taxedPrice(new com.commercetools.api.models.cart.TaxedPriceImpl()) },
+                new Object[] { "taxedShippingPrice",
                         Cart.builder().taxedShippingPrice(new com.commercetools.api.models.cart.TaxedPriceImpl()) },
-                new Object[] { Cart.builder()
+                new Object[] { "discountOnTotalPrice", Cart.builder()
                         .discountOnTotalPrice(new com.commercetools.api.models.cart.DiscountOnTotalPriceImpl()) },
-                new Object[] { Cart.builder().taxMode(com.commercetools.api.models.cart.TaxMode.findEnum("Platform")) },
-                new Object[] { Cart.builder()
-                        .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) },
-                new Object[] { Cart.builder()
-                        .taxCalculationMode(
-                            com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) },
-                new Object[] { Cart.builder()
-                        .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
-                new Object[] {
+                new Object[] { "taxMode",
+                        Cart.builder().taxMode(com.commercetools.api.models.cart.TaxMode.findEnum("Platform")) },
+                new Object[] { "taxRoundingMode",
+                        Cart.builder()
+                                .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) },
+                new Object[] { "taxCalculationMode",
+                        Cart.builder()
+                                .taxCalculationMode(
+                                    com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) },
+                new Object[] { "inventoryMode",
+                        Cart.builder()
+                                .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
+                new Object[] { "cartState",
                         Cart.builder().cartState(com.commercetools.api.models.cart.CartState.findEnum("Active")) },
-                new Object[] { Cart.builder().billingAddress(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { Cart.builder().shippingAddress(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { Cart.builder()
-                        .shippingMode(com.commercetools.api.models.cart.ShippingMode.findEnum("Single")) },
-                new Object[] { Cart.builder().shippingKey("shippingKey") },
-                new Object[] { Cart.builder().shippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) },
-                new Object[] { Cart.builder()
-                        .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
-                new Object[] {
+                new Object[] { "billingAddress",
+                        Cart.builder().billingAddress(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "shippingAddress",
+                        Cart.builder().shippingAddress(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "shippingMode",
+                        Cart.builder()
+                                .shippingMode(com.commercetools.api.models.cart.ShippingMode.findEnum("Single")) },
+                new Object[] { "shippingKey", Cart.builder().shippingKey("shippingKey") },
+                new Object[] { "shippingInfo",
+                        Cart.builder().shippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) },
+                new Object[] { "shippingRateInput",
+                        Cart.builder()
+                                .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
+                new Object[] { "shippingCustomFields",
                         Cart.builder().shippingCustomFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { Cart.builder()
+                new Object[] { "shipping", Cart.builder()
                         .shipping(Collections.singletonList(new com.commercetools.api.models.cart.ShippingImpl())) },
-                new Object[] { Cart.builder()
-                        .itemShippingAddresses(
-                            Collections.singletonList(new com.commercetools.api.models.common.AddressImpl())) },
-                new Object[] {
+                new Object[] { "itemShippingAddresses",
+                        Cart.builder()
+                                .itemShippingAddresses(
+                                    Collections.singletonList(new com.commercetools.api.models.common.AddressImpl())) },
+                new Object[] { "discountCodes",
                         Cart.builder()
                                 .discountCodes(Collections
                                         .singletonList(new com.commercetools.api.models.cart.DiscountCodeInfoImpl())) },
-                new Object[] {
+                new Object[] { "directDiscounts",
                         Cart.builder()
                                 .directDiscounts(Collections
                                         .singletonList(new com.commercetools.api.models.cart.DirectDiscountImpl())) },
-                new Object[] { Cart.builder()
-                        .refusedGifts(Collections.singletonList(
-                            new com.commercetools.api.models.cart_discount.CartDiscountReferenceImpl())) },
-                new Object[] { Cart.builder().paymentInfo(new com.commercetools.api.models.order.PaymentInfoImpl()) },
-                new Object[] { Cart.builder().country("country") }, new Object[] { Cart.builder().locale("locale") },
-                new Object[] {
+                new Object[] { "refusedGifts",
+                        Cart.builder()
+                                .refusedGifts(Collections.singletonList(
+                                    new com.commercetools.api.models.cart_discount.CartDiscountReferenceImpl())) },
+                new Object[] { "paymentInfo",
+                        Cart.builder().paymentInfo(new com.commercetools.api.models.order.PaymentInfoImpl()) },
+                new Object[] { "country", Cart.builder().country("country") },
+                new Object[] { "locale", Cart.builder().locale("locale") },
+                new Object[] { "origin",
                         Cart.builder().origin(com.commercetools.api.models.cart.CartOrigin.findEnum("Customer")) },
-                new Object[] { Cart.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { Cart.builder()
+                new Object[] { "custom",
+                        Cart.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "discountTypeCombination", Cart.builder()
                         .discountTypeCombination(new com.commercetools.api.models.cart.DiscountTypeCombinationImpl()) },
-                new Object[] { Cart.builder().deleteDaysAfterLastModification(3) },
-                new Object[] { Cart.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Cart.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+                new Object[] { "deleteDaysAfterLastModification", Cart.builder().deleteDaysAfterLastModification(3) },
+                new Object[] { "createdAt", Cart.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Cart.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
                         Cart.builder().lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Cart.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) } };
+                new Object[] { "createdBy",
+                        Cart.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartUnfreezeCartActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartUnfreezeCartActionTest.java
index bffdf1e0cfa..c15eb04d3b3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartUnfreezeCartActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartUnfreezeCartActionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartUnfreezeCartActionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartUpdateItemShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartUpdateItemShippingAddressActionTest.java
index 9cf54ac20c6..1f395a8a0ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartUpdateItemShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartUpdateItemShippingAddressActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartUpdateItemShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartUpdateItemShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartUpdateItemShippingAddressActionBuilder builder) {
         CartUpdateItemShippingAddressAction cartUpdateItemShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(cartUpdateItemShippingAddressAction)
                 .isInstanceOf(CartUpdateItemShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartUpdateItemShippingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", CartUpdateItemShippingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartUpdateTest.java
index 1a9669d77e9..4566087f670 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CartUpdateTest.java
@@ -3,31 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartUpdateBuilder builder) {
         CartUpdate cartUpdate = builder.buildUnchecked();
         Assertions.assertThat(cartUpdate).isInstanceOf(CartUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartUpdate.builder().version(2L) }, new Object[] { CartUpdate.builder()
-                .actions(Collections.singletonList(new com.commercetools.api.models.cart.CartUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", CartUpdate.builder().version(2L) }, new Object[] { "actions",
+                CartUpdate.builder()
+                        .actions(Collections
+                                .singletonList(new com.commercetools.api.models.cart.CartUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ClassificationShippingRateInputDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ClassificationShippingRateInputDraftTest.java
index 5260461a3e9..c978c83d272 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ClassificationShippingRateInputDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ClassificationShippingRateInputDraftTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ClassificationShippingRateInputDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ClassificationShippingRateInputDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ClassificationShippingRateInputDraftBuilder builder) {
         ClassificationShippingRateInputDraft classificationShippingRateInputDraft = builder.buildUnchecked();
         Assertions.assertThat(classificationShippingRateInputDraft)
                 .isInstanceOf(ClassificationShippingRateInputDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ClassificationShippingRateInputDraft.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ClassificationShippingRateInputDraft.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ClassificationShippingRateInputTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ClassificationShippingRateInputTest.java
index 0f91ddb05fc..329140e1bdb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ClassificationShippingRateInputTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ClassificationShippingRateInputTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ClassificationShippingRateInputTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ClassificationShippingRateInputBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ClassificationShippingRateInputBuilder builder) {
         ClassificationShippingRateInput classificationShippingRateInput = builder.buildUnchecked();
         Assertions.assertThat(classificationShippingRateInput).isInstanceOf(ClassificationShippingRateInput.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ClassificationShippingRateInput.builder().key("key") },
-                new Object[] { ClassificationShippingRateInput.builder()
+        return new Object[][] { new Object[] { "key", ClassificationShippingRateInput.builder().key("key") },
+                new Object[] { "label", ClassificationShippingRateInput.builder()
                         .label(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CustomLineItemDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CustomLineItemDraftTest.java
index 18d64acae12..faf6d32c1fc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CustomLineItemDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CustomLineItemDraftTest.java
@@ -1,47 +1,42 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomLineItemDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomLineItemDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomLineItemDraftBuilder builder) {
         CustomLineItemDraft customLineItemDraft = builder.buildUnchecked();
         Assertions.assertThat(customLineItemDraft).isInstanceOf(CustomLineItemDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomLineItemDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CustomLineItemDraft.builder().key("key") },
-                new Object[] { CustomLineItemDraft.builder().quantity(8L) },
-                new Object[] {
+                new Object[] { "name",
+                        CustomLineItemDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "key", CustomLineItemDraft.builder().key("key") },
+                new Object[] { "quantity", CustomLineItemDraft.builder().quantity(8L) },
+                new Object[] { "money",
                         CustomLineItemDraft.builder().money(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { CustomLineItemDraft.builder().slug("slug") },
-                new Object[] { CustomLineItemDraft.builder()
+                new Object[] { "slug", CustomLineItemDraft.builder().slug("slug") },
+                new Object[] { "taxCategory", CustomLineItemDraft.builder()
                         .taxCategory(
                             new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) },
-                new Object[] { CustomLineItemDraft.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { CustomLineItemDraft.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { CustomLineItemDraft.builder()
+                new Object[] { "externalTaxRate",
+                        CustomLineItemDraft.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "custom",
+                        CustomLineItemDraft.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "shippingDetails", CustomLineItemDraft.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) },
-                new Object[] { CustomLineItemDraft.builder()
+                new Object[] { "priceMode", CustomLineItemDraft.builder()
                         .priceMode(com.commercetools.api.models.cart.CustomLineItemPriceMode.findEnum("Standard")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CustomLineItemTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CustomLineItemTest.java
index b555328e74e..bfaa3430f55 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CustomLineItemTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CustomLineItemTest.java
@@ -3,63 +3,61 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomLineItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomLineItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomLineItemBuilder builder) {
         CustomLineItem customLineItem = builder.buildUnchecked();
         Assertions.assertThat(customLineItem).isInstanceOf(CustomLineItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomLineItem.builder().id("id") },
-                new Object[] { CustomLineItem.builder().key("key") },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", CustomLineItem.builder().id("id") },
+                new Object[] { "key", CustomLineItem.builder().key("key") },
+                new Object[] { "name",
                         CustomLineItem.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+                new Object[] { "money",
                         CustomLineItem.builder().money(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] { CustomLineItem.builder()
-                        .taxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) },
-                new Object[] {
+                new Object[] { "taxedPrice",
+                        CustomLineItem.builder()
+                                .taxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) },
+                new Object[] { "taxedPricePortions",
                         CustomLineItem.builder()
                                 .taxedPricePortions(Collections
                                         .singletonList(new com.commercetools.api.models.cart.MethodTaxedPriceImpl())) },
-                new Object[] { CustomLineItem.builder()
-                        .totalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { CustomLineItem.builder().slug("slug") },
-                new Object[] { CustomLineItem.builder().quantity(8L) },
-                new Object[] { CustomLineItem.builder()
-                        .state(Collections.singletonList(new com.commercetools.api.models.order.ItemStateImpl())) },
-                new Object[] { CustomLineItem.builder()
+                new Object[] { "totalPrice",
+                        CustomLineItem.builder()
+                                .totalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "slug", CustomLineItem.builder().slug("slug") },
+                new Object[] { "quantity", CustomLineItem.builder().quantity(8L) },
+                new Object[] { "state",
+                        CustomLineItem.builder()
+                                .state(Collections
+                                        .singletonList(new com.commercetools.api.models.order.ItemStateImpl())) },
+                new Object[] { "taxCategory", CustomLineItem.builder()
                         .taxCategory(new com.commercetools.api.models.tax_category.TaxCategoryReferenceImpl()) },
-                new Object[] {
+                new Object[] { "taxRate",
                         CustomLineItem.builder().taxRate(new com.commercetools.api.models.tax_category.TaxRateImpl()) },
-                new Object[] {
+                new Object[] { "perMethodTaxRate",
                         CustomLineItem.builder()
                                 .perMethodTaxRate(Collections
                                         .singletonList(new com.commercetools.api.models.cart.MethodTaxRateImpl())) },
-                new Object[] { CustomLineItem.builder()
-                        .discountedPricePerQuantity(Collections.singletonList(
-                            new com.commercetools.api.models.cart.DiscountedLineItemPriceForQuantityImpl())) },
-                new Object[] {
+                new Object[] { "discountedPricePerQuantity",
+                        CustomLineItem.builder()
+                                .discountedPricePerQuantity(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.DiscountedLineItemPriceForQuantityImpl())) },
+                new Object[] { "custom",
                         CustomLineItem.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { CustomLineItem.builder()
-                        .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsImpl()) },
-                new Object[] { CustomLineItem.builder()
+                new Object[] { "shippingDetails",
+                        CustomLineItem.builder()
+                                .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsImpl()) },
+                new Object[] { "priceMode", CustomLineItem.builder()
                         .priceMode(com.commercetools.api.models.cart.CustomLineItemPriceMode.findEnum("Standard")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CustomShippingDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CustomShippingDraftTest.java
index bb1c6c615a3..aae7eb0d9d4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CustomShippingDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/CustomShippingDraftTest.java
@@ -3,47 +3,42 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomShippingDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomShippingDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomShippingDraftBuilder builder) {
         CustomShippingDraft customShippingDraft = builder.buildUnchecked();
         Assertions.assertThat(customShippingDraft).isInstanceOf(CustomShippingDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomShippingDraft.builder().key("key") },
-                new Object[] { CustomShippingDraft.builder().shippingMethodName("shippingMethodName") },
-                new Object[] { CustomShippingDraft.builder()
-                        .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { CustomShippingDraft.builder()
+        return new Object[][] { new Object[] { "key", CustomShippingDraft.builder().key("key") },
+                new Object[] { "shippingMethodName",
+                        CustomShippingDraft.builder().shippingMethodName("shippingMethodName") },
+                new Object[] { "shippingAddress",
+                        CustomShippingDraft.builder()
+                                .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "shippingRate", CustomShippingDraft.builder()
                         .shippingRate(new com.commercetools.api.models.shipping_method.ShippingRateDraftImpl()) },
-                new Object[] { CustomShippingDraft.builder()
+                new Object[] { "shippingRateInput", CustomShippingDraft.builder()
                         .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputDraftImpl()) },
-                new Object[] { CustomShippingDraft.builder()
+                new Object[] { "taxCategory", CustomShippingDraft.builder()
                         .taxCategory(
                             new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) },
-                new Object[] { CustomShippingDraft.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] {
+                new Object[] { "externalTaxRate",
+                        CustomShippingDraft.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "deliveries",
                         CustomShippingDraft.builder()
                                 .deliveries(Collections
                                         .singletonList(new com.commercetools.api.models.order.DeliveryDraftImpl())) },
-                new Object[] { CustomShippingDraft.builder()
+                new Object[] { "custom", CustomShippingDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DirectDiscountDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DirectDiscountDraftTest.java
index e68bd1d8084..e358efdd817 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DirectDiscountDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DirectDiscountDraftTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DirectDiscountDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DirectDiscountDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DirectDiscountDraftBuilder builder) {
         DirectDiscountDraft directDiscountDraft = builder.buildUnchecked();
         Assertions.assertThat(directDiscountDraft).isInstanceOf(DirectDiscountDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DirectDiscountDraft.builder()
-                        .value(new com.commercetools.api.models.cart_discount.CartDiscountValueDraftImpl()) },
-                new Object[] { DirectDiscountDraft.builder()
+                new Object[] { "value",
+                        DirectDiscountDraft.builder()
+                                .value(new com.commercetools.api.models.cart_discount.CartDiscountValueDraftImpl()) },
+                new Object[] { "target", DirectDiscountDraft.builder()
                         .target(new com.commercetools.api.models.cart_discount.CartDiscountTargetImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DirectDiscountReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DirectDiscountReferenceTest.java
index 640e9da96ca..481a873c454 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DirectDiscountReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DirectDiscountReferenceTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DirectDiscountReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DirectDiscountReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DirectDiscountReferenceBuilder builder) {
         DirectDiscountReference directDiscountReference = builder.buildUnchecked();
         Assertions.assertThat(directDiscountReference).isInstanceOf(DirectDiscountReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DirectDiscountReference.builder().id("id") } };
+        return new Object[][] { new Object[] { "id", DirectDiscountReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DirectDiscountTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DirectDiscountTest.java
index edadc976a15..7ab17192f3d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DirectDiscountTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DirectDiscountTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DirectDiscountTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DirectDiscountBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DirectDiscountBuilder builder) {
         DirectDiscount directDiscount = builder.buildUnchecked();
         Assertions.assertThat(directDiscount).isInstanceOf(DirectDiscount.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DirectDiscount.builder().id("id") },
-                new Object[] { DirectDiscount.builder()
-                        .value(new com.commercetools.api.models.cart_discount.CartDiscountValueImpl()) },
-                new Object[] { DirectDiscount.builder()
+        return new Object[][] { new Object[] { "id", DirectDiscount.builder().id("id") },
+                new Object[] { "value",
+                        DirectDiscount.builder()
+                                .value(new com.commercetools.api.models.cart_discount.CartDiscountValueImpl()) },
+                new Object[] { "target", DirectDiscount.builder()
                         .target(new com.commercetools.api.models.cart_discount.CartDiscountTargetImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountCodeInfoTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountCodeInfoTest.java
index 1eb0c972b4a..a53f8976918 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountCodeInfoTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountCodeInfoTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeInfoBuilder builder) {
         DiscountCodeInfo discountCodeInfo = builder.buildUnchecked();
         Assertions.assertThat(discountCodeInfo).isInstanceOf(DiscountCodeInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountCodeInfo.builder()
+                new Object[] { "discountCode", DiscountCodeInfo.builder()
                         .discountCode(new com.commercetools.api.models.discount_code.DiscountCodeReferenceImpl()) },
-                new Object[] { DiscountCodeInfo.builder()
+                new Object[] { "state", DiscountCodeInfo.builder()
                         .state(com.commercetools.api.models.cart.DiscountCodeState.findEnum("NotActive")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountOnTotalPriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountOnTotalPriceTest.java
index 9b18ffc7965..af5757f6f9d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountOnTotalPriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountOnTotalPriceTest.java
@@ -3,38 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountOnTotalPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountOnTotalPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountOnTotalPriceBuilder builder) {
         DiscountOnTotalPrice discountOnTotalPrice = builder.buildUnchecked();
         Assertions.assertThat(discountOnTotalPrice).isInstanceOf(DiscountOnTotalPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountOnTotalPrice.builder()
-                        .discountedAmount(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] { DiscountOnTotalPrice.builder()
-                        .includedDiscounts(Collections.singletonList(
-                            new com.commercetools.api.models.cart.DiscountedTotalPricePortionImpl())) },
-                new Object[] { DiscountOnTotalPrice.builder()
-                        .discountedNetAmount(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] { DiscountOnTotalPrice.builder()
+                new Object[] { "discountedAmount",
+                        DiscountOnTotalPrice.builder()
+                                .discountedAmount(new com.commercetools.api.models.common.TypedMoneyImpl()) },
+                new Object[] { "includedDiscounts",
+                        DiscountOnTotalPrice.builder()
+                                .includedDiscounts(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.DiscountedTotalPricePortionImpl())) },
+                new Object[] { "discountedNetAmount",
+                        DiscountOnTotalPrice.builder()
+                                .discountedNetAmount(new com.commercetools.api.models.common.TypedMoneyImpl()) },
+                new Object[] { "discountedGrossAmount", DiscountOnTotalPrice.builder()
                         .discountedGrossAmount(new com.commercetools.api.models.common.TypedMoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPortionDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPortionDraftTest.java
index 5096e597596..fe34303e98c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPortionDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPortionDraftTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedLineItemPortionDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedLineItemPortionDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedLineItemPortionDraftBuilder builder) {
         DiscountedLineItemPortionDraft discountedLineItemPortionDraft = builder.buildUnchecked();
         Assertions.assertThat(discountedLineItemPortionDraft).isInstanceOf(DiscountedLineItemPortionDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountedLineItemPortionDraft.builder()
-                        .discount(new com.commercetools.api.models.common.ReferenceImpl()) },
-                new Object[] { DiscountedLineItemPortionDraft.builder()
+                new Object[] { "discount",
+                        DiscountedLineItemPortionDraft.builder()
+                                .discount(new com.commercetools.api.models.common.ReferenceImpl()) },
+                new Object[] { "discountedAmount", DiscountedLineItemPortionDraft.builder()
                         .discountedAmount(new com.commercetools.api.models.common.TypedMoneyDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPortionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPortionTest.java
index 11b30959b53..36057f21c43 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPortionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPortionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedLineItemPortionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedLineItemPortionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedLineItemPortionBuilder builder) {
         DiscountedLineItemPortion discountedLineItemPortion = builder.buildUnchecked();
         Assertions.assertThat(discountedLineItemPortion).isInstanceOf(DiscountedLineItemPortion.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountedLineItemPortion.builder()
-                        .discount(new com.commercetools.api.models.common.ReferenceImpl()) },
-                new Object[] { DiscountedLineItemPortion.builder()
+                new Object[] { "discount",
+                        DiscountedLineItemPortion.builder()
+                                .discount(new com.commercetools.api.models.common.ReferenceImpl()) },
+                new Object[] { "discountedAmount", DiscountedLineItemPortion.builder()
                         .discountedAmount(new com.commercetools.api.models.common.TypedMoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPriceForQuantityTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPriceForQuantityTest.java
index 211bf882604..25a842644ca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPriceForQuantityTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPriceForQuantityTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedLineItemPriceForQuantityTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedLineItemPriceForQuantityBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedLineItemPriceForQuantityBuilder builder) {
         DiscountedLineItemPriceForQuantity discountedLineItemPriceForQuantity = builder.buildUnchecked();
         Assertions.assertThat(discountedLineItemPriceForQuantity)
                 .isInstanceOf(DiscountedLineItemPriceForQuantity.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountedLineItemPriceForQuantity.builder().quantity(8L) },
-                new Object[] { DiscountedLineItemPriceForQuantity.builder()
+        return new Object[][] { new Object[] { "quantity", DiscountedLineItemPriceForQuantity.builder().quantity(8L) },
+                new Object[] { "discountedPrice", DiscountedLineItemPriceForQuantity.builder()
                         .discountedPrice(new com.commercetools.api.models.cart.DiscountedLineItemPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPriceTest.java
index eeb6f820b1e..44980e05174 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedLineItemPriceTest.java
@@ -3,35 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedLineItemPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedLineItemPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedLineItemPriceBuilder builder) {
         DiscountedLineItemPrice discountedLineItemPrice = builder.buildUnchecked();
         Assertions.assertThat(discountedLineItemPrice).isInstanceOf(DiscountedLineItemPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountedLineItemPrice.builder()
-                        .value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] { DiscountedLineItemPrice.builder()
-                        .includedDiscounts(Collections.singletonList(
-                            new com.commercetools.api.models.cart.DiscountedLineItemPortionImpl())) } };
+                new Object[] { "value",
+                        DiscountedLineItemPrice.builder()
+                                .value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
+                new Object[] { "includedDiscounts",
+                        DiscountedLineItemPrice.builder()
+                                .includedDiscounts(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.DiscountedLineItemPortionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionTest.java
index 8152d92d9d0..4f8f9fed41a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/DiscountedTotalPricePortionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedTotalPricePortionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedTotalPricePortionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedTotalPricePortionBuilder builder) {
         DiscountedTotalPricePortion discountedTotalPricePortion = builder.buildUnchecked();
         Assertions.assertThat(discountedTotalPricePortion).isInstanceOf(DiscountedTotalPricePortion.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountedTotalPricePortion.builder()
-                        .discount(new com.commercetools.api.models.common.ReferenceImpl()) },
-                new Object[] { DiscountedTotalPricePortion.builder()
+                new Object[] { "discount",
+                        DiscountedTotalPricePortion.builder()
+                                .discount(new com.commercetools.api.models.common.ReferenceImpl()) },
+                new Object[] { "discountedAmount", DiscountedTotalPricePortion.builder()
                         .discountedAmount(new com.commercetools.api.models.common.TypedMoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ExternalLineItemTotalPriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ExternalLineItemTotalPriceTest.java
index d2c978202fb..4130830dfba 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ExternalLineItemTotalPriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ExternalLineItemTotalPriceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExternalLineItemTotalPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExternalLineItemTotalPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExternalLineItemTotalPriceBuilder builder) {
         ExternalLineItemTotalPrice externalLineItemTotalPrice = builder.buildUnchecked();
         Assertions.assertThat(externalLineItemTotalPrice).isInstanceOf(ExternalLineItemTotalPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ExternalLineItemTotalPrice.builder()
-                        .price(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { ExternalLineItemTotalPrice.builder()
+                new Object[] { "price",
+                        ExternalLineItemTotalPrice.builder()
+                                .price(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "totalPrice", ExternalLineItemTotalPrice.builder()
                         .totalPrice(new com.commercetools.api.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ExternalTaxAmountDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ExternalTaxAmountDraftTest.java
index af108233ee2..2ff68a71444 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ExternalTaxAmountDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ExternalTaxAmountDraftTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExternalTaxAmountDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExternalTaxAmountDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExternalTaxAmountDraftBuilder builder) {
         ExternalTaxAmountDraft externalTaxAmountDraft = builder.buildUnchecked();
         Assertions.assertThat(externalTaxAmountDraft).isInstanceOf(ExternalTaxAmountDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ExternalTaxAmountDraft.builder()
-                        .totalGross(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { ExternalTaxAmountDraft.builder()
+                new Object[] { "totalGross",
+                        ExternalTaxAmountDraft.builder()
+                                .totalGross(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "taxRate", ExternalTaxAmountDraft.builder()
                         .taxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ExternalTaxRateDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ExternalTaxRateDraftTest.java
index 4d44242ce19..a67d60f55ef 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ExternalTaxRateDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ExternalTaxRateDraftTest.java
@@ -3,35 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExternalTaxRateDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExternalTaxRateDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExternalTaxRateDraftBuilder builder) {
         ExternalTaxRateDraft externalTaxRateDraft = builder.buildUnchecked();
         Assertions.assertThat(externalTaxRateDraft).isInstanceOf(ExternalTaxRateDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExternalTaxRateDraft.builder().name("name") },
-                new Object[] { ExternalTaxRateDraft.builder().amount(0.43789625) },
-                new Object[] { ExternalTaxRateDraft.builder().includedInPrice(true) },
-                new Object[] { ExternalTaxRateDraft.builder().country("country") },
-                new Object[] { ExternalTaxRateDraft.builder().state("state") },
-                new Object[] { ExternalTaxRateDraft.builder()
+        return new Object[][] { new Object[] { "name", ExternalTaxRateDraft.builder().name("name") },
+                new Object[] { "amount", ExternalTaxRateDraft.builder().amount(0.43789625) },
+                new Object[] { "includedInPrice", ExternalTaxRateDraft.builder().includedInPrice(true) },
+                new Object[] { "country", ExternalTaxRateDraft.builder().country("country") },
+                new Object[] { "state", ExternalTaxRateDraft.builder().state("state") },
+                new Object[] { "subRates", ExternalTaxRateDraft.builder()
                         .subRates(
                             Collections.singletonList(new com.commercetools.api.models.tax_category.SubRateImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ItemShippingDetailsDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ItemShippingDetailsDraftTest.java
index 809f18d57f3..858553e1f15 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ItemShippingDetailsDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ItemShippingDetailsDraftTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ItemShippingDetailsDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ItemShippingDetailsDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ItemShippingDetailsDraftBuilder builder) {
         ItemShippingDetailsDraft itemShippingDetailsDraft = builder.buildUnchecked();
         Assertions.assertThat(itemShippingDetailsDraft).isInstanceOf(ItemShippingDetailsDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ItemShippingDetailsDraft.builder()
+        return new Object[][] { new Object[] { "targets", ItemShippingDetailsDraft.builder()
                 .targets(Collections.singletonList(new com.commercetools.api.models.cart.ItemShippingTargetImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ItemShippingDetailsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ItemShippingDetailsTest.java
index 77ec9b3adf1..a321a970c79 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ItemShippingDetailsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ItemShippingDetailsTest.java
@@ -3,34 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ItemShippingDetailsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ItemShippingDetailsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ItemShippingDetailsBuilder builder) {
         ItemShippingDetails itemShippingDetails = builder.buildUnchecked();
         Assertions.assertThat(itemShippingDetails).isInstanceOf(ItemShippingDetails.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ItemShippingDetails.builder()
-                        .targets(Collections
-                                .singletonList(new com.commercetools.api.models.cart.ItemShippingTargetImpl())) },
-                new Object[] { ItemShippingDetails.builder().valid(true) } };
+                new Object[] { "targets",
+                        ItemShippingDetails.builder()
+                                .targets(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.ItemShippingTargetImpl())) },
+                new Object[] { "valid", ItemShippingDetails.builder().valid(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ItemShippingTargetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ItemShippingTargetTest.java
index 5d918a8efb5..6cbbf208458 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ItemShippingTargetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ItemShippingTargetTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ItemShippingTargetTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ItemShippingTargetBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ItemShippingTargetBuilder builder) {
         ItemShippingTarget itemShippingTarget = builder.buildUnchecked();
         Assertions.assertThat(itemShippingTarget).isInstanceOf(ItemShippingTarget.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ItemShippingTarget.builder().addressKey("addressKey") },
-                new Object[] { ItemShippingTarget.builder().quantity(8L) },
-                new Object[] { ItemShippingTarget.builder().shippingMethodKey("shippingMethodKey") } };
+        return new Object[][] { new Object[] { "addressKey", ItemShippingTarget.builder().addressKey("addressKey") },
+                new Object[] { "quantity", ItemShippingTarget.builder().quantity(8L) }, new Object[] {
+                        "shippingMethodKey", ItemShippingTarget.builder().shippingMethodKey("shippingMethodKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/LineItemDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/LineItemDraftTest.java
index 3c25d6dec85..1fff139b73e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/LineItemDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/LineItemDraftTest.java
@@ -4,54 +4,50 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LineItemDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LineItemDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LineItemDraftBuilder builder) {
         LineItemDraft lineItemDraft = builder.buildUnchecked();
         Assertions.assertThat(lineItemDraft).isInstanceOf(LineItemDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LineItemDraft.builder().key("key") },
-                new Object[] { LineItemDraft.builder().productId("productId") },
-                new Object[] { LineItemDraft.builder().variantId(5L) },
-                new Object[] { LineItemDraft.builder().sku("sku") },
-                new Object[] { LineItemDraft.builder().quantity(8L) },
-                new Object[] { LineItemDraft.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { LineItemDraft.builder()
-                        .distributionChannel(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { LineItemDraft.builder()
+        return new Object[][] { new Object[] { "key", LineItemDraft.builder().key("key") },
+                new Object[] { "productId", LineItemDraft.builder().productId("productId") },
+                new Object[] { "variantId", LineItemDraft.builder().variantId(5L) },
+                new Object[] { "sku", LineItemDraft.builder().sku("sku") },
+                new Object[] { "quantity", LineItemDraft.builder().quantity(8L) },
+                new Object[] { "addedAt", LineItemDraft.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "distributionChannel",
+                        LineItemDraft.builder()
+                                .distributionChannel(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "supplyChannel", LineItemDraft.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] {
+                new Object[] { "externalPrice",
                         LineItemDraft.builder().externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { LineItemDraft.builder()
+                new Object[] { "externalTotalPrice", LineItemDraft.builder()
                         .externalTotalPrice(new com.commercetools.api.models.cart.ExternalLineItemTotalPriceImpl()) },
-                new Object[] { LineItemDraft.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { LineItemDraft.builder()
-                        .perMethodExternalTaxRate(Collections.singletonList(
-                            new com.commercetools.api.models.cart.MethodExternalTaxRateDraftImpl())) },
-                new Object[] { LineItemDraft.builder()
-                        .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
-                new Object[] { LineItemDraft.builder()
+                new Object[] { "externalTaxRate",
+                        LineItemDraft.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "perMethodExternalTaxRate",
+                        LineItemDraft.builder()
+                                .perMethodExternalTaxRate(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.MethodExternalTaxRateDraftImpl())) },
+                new Object[] { "inventoryMode",
+                        LineItemDraft.builder()
+                                .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
+                new Object[] { "shippingDetails", LineItemDraft.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) },
-                new Object[] { LineItemDraft.builder()
+                new Object[] { "custom", LineItemDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/LineItemTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/LineItemTest.java
index 5d22052418d..ab4a0b353bc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/LineItemTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/LineItemTest.java
@@ -4,76 +4,81 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LineItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LineItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LineItemBuilder builder) {
         LineItem lineItem = builder.buildUnchecked();
         Assertions.assertThat(lineItem).isInstanceOf(LineItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LineItem.builder().id("id") },
-                new Object[] { LineItem.builder().key("key") },
-                new Object[] { LineItem.builder().productId("productId") },
-                new Object[] { LineItem.builder().productKey("productKey") },
-                new Object[] { LineItem.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", LineItem.builder().id("id") },
+                new Object[] { "key", LineItem.builder().key("key") },
+                new Object[] { "productId", LineItem.builder().productId("productId") },
+                new Object[] { "productKey", LineItem.builder().productKey("productKey") },
+                new Object[] { "name",
+                        LineItem.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "productSlug",
                         LineItem.builder().productSlug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { LineItem.builder()
+                new Object[] { "productType", LineItem.builder()
                         .productType(new com.commercetools.api.models.product_type.ProductTypeReferenceImpl()) },
-                new Object[] {
+                new Object[] { "variant",
                         LineItem.builder().variant(new com.commercetools.api.models.product.ProductVariantImpl()) },
-                new Object[] { LineItem.builder().price(new com.commercetools.api.models.common.PriceImpl()) },
-                new Object[] { LineItem.builder().quantity(8L) },
-                new Object[] { LineItem.builder()
-                        .totalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { LineItem.builder()
-                        .discountedPricePerQuantity(Collections.singletonList(
-                            new com.commercetools.api.models.cart.DiscountedLineItemPriceForQuantityImpl())) },
-                new Object[] {
+                new Object[] { "price", LineItem.builder().price(new com.commercetools.api.models.common.PriceImpl()) },
+                new Object[] { "quantity", LineItem.builder().quantity(8L) },
+                new Object[] { "totalPrice",
+                        LineItem.builder()
+                                .totalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "discountedPricePerQuantity",
+                        LineItem.builder()
+                                .discountedPricePerQuantity(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.DiscountedLineItemPriceForQuantityImpl())) },
+                new Object[] { "taxedPrice",
                         LineItem.builder().taxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) },
-                new Object[] {
+                new Object[] { "taxedPricePortions",
                         LineItem.builder()
                                 .taxedPricePortions(Collections
                                         .singletonList(new com.commercetools.api.models.cart.MethodTaxedPriceImpl())) },
-                new Object[] { LineItem.builder()
-                        .state(Collections.singletonList(new com.commercetools.api.models.order.ItemStateImpl())) },
-                new Object[] {
+                new Object[] { "state",
+                        LineItem.builder()
+                                .state(Collections
+                                        .singletonList(new com.commercetools.api.models.order.ItemStateImpl())) },
+                new Object[] { "taxRate",
                         LineItem.builder().taxRate(new com.commercetools.api.models.tax_category.TaxRateImpl()) },
-                new Object[] {
+                new Object[] { "perMethodTaxRate",
                         LineItem.builder()
                                 .perMethodTaxRate(Collections
                                         .singletonList(new com.commercetools.api.models.cart.MethodTaxRateImpl())) },
-                new Object[] { LineItem.builder()
-                        .supplyChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
-                new Object[] { LineItem.builder()
-                        .distributionChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
-                new Object[] { LineItem.builder()
-                        .priceMode(com.commercetools.api.models.cart.LineItemPriceMode.findEnum("Platform")) },
-                new Object[] { LineItem.builder()
-                        .lineItemMode(com.commercetools.api.models.cart.LineItemMode.findEnum("Standard")) },
-                new Object[] { LineItem.builder()
-                        .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
-                new Object[] { LineItem.builder()
-                        .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsImpl()) },
-                new Object[] { LineItem.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { LineItem.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { LineItem.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "supplyChannel",
+                        LineItem.builder()
+                                .supplyChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
+                new Object[] { "distributionChannel",
+                        LineItem.builder()
+                                .distributionChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
+                new Object[] { "priceMode",
+                        LineItem.builder()
+                                .priceMode(com.commercetools.api.models.cart.LineItemPriceMode.findEnum("Platform")) },
+                new Object[] { "lineItemMode",
+                        LineItem.builder()
+                                .lineItemMode(com.commercetools.api.models.cart.LineItemMode.findEnum("Standard")) },
+                new Object[] { "inventoryMode",
+                        LineItem.builder()
+                                .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
+                new Object[] { "shippingDetails",
+                        LineItem.builder()
+                                .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsImpl()) },
+                new Object[] { "custom",
+                        LineItem.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "addedAt", LineItem.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        LineItem.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/MethodExternalTaxRateDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/MethodExternalTaxRateDraftTest.java
index b81617a29ea..cbd040553ad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/MethodExternalTaxRateDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/MethodExternalTaxRateDraftTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MethodExternalTaxRateDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MethodExternalTaxRateDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MethodExternalTaxRateDraftBuilder builder) {
         MethodExternalTaxRateDraft methodExternalTaxRateDraft = builder.buildUnchecked();
         Assertions.assertThat(methodExternalTaxRateDraft).isInstanceOf(MethodExternalTaxRateDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MethodExternalTaxRateDraft.builder().shippingMethodKey("shippingMethodKey") },
-                new Object[] { MethodExternalTaxRateDraft.builder()
+                new Object[] { "shippingMethodKey",
+                        MethodExternalTaxRateDraft.builder().shippingMethodKey("shippingMethodKey") },
+                new Object[] { "taxRate", MethodExternalTaxRateDraft.builder()
                         .taxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/MethodTaxRateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/MethodTaxRateTest.java
index 29e24419983..c6a806d59e9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/MethodTaxRateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/MethodTaxRateTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MethodTaxRateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MethodTaxRateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MethodTaxRateBuilder builder) {
         MethodTaxRate methodTaxRate = builder.buildUnchecked();
         Assertions.assertThat(methodTaxRate).isInstanceOf(MethodTaxRate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MethodTaxRate.builder().shippingMethodKey("shippingMethodKey") },
-                new Object[] { MethodTaxRate.builder()
+        return new Object[][] {
+                new Object[] { "shippingMethodKey", MethodTaxRate.builder().shippingMethodKey("shippingMethodKey") },
+                new Object[] { "taxRate", MethodTaxRate.builder()
                         .taxRate(new com.commercetools.api.models.tax_category.TaxRateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/MethodTaxedPriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/MethodTaxedPriceTest.java
index 2cdbb10e1a1..4577745ca38 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/MethodTaxedPriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/MethodTaxedPriceTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MethodTaxedPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MethodTaxedPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MethodTaxedPriceBuilder builder) {
         MethodTaxedPrice methodTaxedPrice = builder.buildUnchecked();
         Assertions.assertThat(methodTaxedPrice).isInstanceOf(MethodTaxedPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MethodTaxedPrice.builder().shippingMethodKey("shippingMethodKey") },
-                new Object[] { MethodTaxedPrice.builder()
+        return new Object[][] {
+                new Object[] { "shippingMethodKey", MethodTaxedPrice.builder().shippingMethodKey("shippingMethodKey") },
+                new Object[] { "taxedPrice", MethodTaxedPrice.builder()
                         .taxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ProductTailoringUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ProductTailoringUpdateTest.java
index efbf8f6aa5a..9fc55cb7d7a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ProductTailoringUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ProductTailoringUpdateTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringUpdateBuilder builder) {
         ProductTailoringUpdate productTailoringUpdate = builder.buildUnchecked();
         Assertions.assertThat(productTailoringUpdate).isInstanceOf(ProductTailoringUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringUpdate.builder().version(2L) },
-                new Object[] { ProductTailoringUpdate.builder()
+        return new Object[][] { new Object[] { "version", ProductTailoringUpdate.builder().version(2L) },
+                new Object[] { "actions", ProductTailoringUpdate.builder()
                         .actions(Collections.singletonList(
                             new com.commercetools.api.models.product_tailoring.ProductTailoringUpdateActionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ReplicaCartDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ReplicaCartDraftTest.java
index ffa18430119..657b73aeac0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ReplicaCartDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ReplicaCartDraftTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReplicaCartDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReplicaCartDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReplicaCartDraftBuilder builder) {
         ReplicaCartDraft replicaCartDraft = builder.buildUnchecked();
         Assertions.assertThat(replicaCartDraft).isInstanceOf(ReplicaCartDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "reference",
                         ReplicaCartDraft.builder().reference(new com.commercetools.api.models.common.ReferenceImpl()) },
-                new Object[] { ReplicaCartDraft.builder().key("key") } };
+                new Object[] { "key", ReplicaCartDraft.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ScoreShippingRateInputDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ScoreShippingRateInputDraftTest.java
index b36105f03c3..6d6986f9841 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ScoreShippingRateInputDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ScoreShippingRateInputDraftTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ScoreShippingRateInputDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ScoreShippingRateInputDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ScoreShippingRateInputDraftBuilder builder) {
         ScoreShippingRateInputDraft scoreShippingRateInputDraft = builder.buildUnchecked();
         Assertions.assertThat(scoreShippingRateInputDraft).isInstanceOf(ScoreShippingRateInputDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ScoreShippingRateInputDraft.builder().score(9L) } };
+        return new Object[][] { new Object[] { "score", ScoreShippingRateInputDraft.builder().score(9L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ScoreShippingRateInputTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ScoreShippingRateInputTest.java
index aeec0ce5991..4a6432aa28c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ScoreShippingRateInputTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ScoreShippingRateInputTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ScoreShippingRateInputTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ScoreShippingRateInputBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ScoreShippingRateInputBuilder builder) {
         ScoreShippingRateInput scoreShippingRateInput = builder.buildUnchecked();
         Assertions.assertThat(scoreShippingRateInput).isInstanceOf(ScoreShippingRateInput.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ScoreShippingRateInput.builder().score(9L) } };
+        return new Object[][] { new Object[] { "score", ScoreShippingRateInput.builder().score(9L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ShippingDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ShippingDraftTest.java
index c2051ce7c34..484a67e03b1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ShippingDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ShippingDraftTest.java
@@ -3,44 +3,39 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingDraftBuilder builder) {
         ShippingDraft shippingDraft = builder.buildUnchecked();
         Assertions.assertThat(shippingDraft).isInstanceOf(ShippingDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingDraft.builder().key("key") },
-                new Object[] { ShippingDraft.builder()
-                        .shippingMethod(
-                            new com.commercetools.api.models.shipping_method.ShippingMethodReferenceImpl()) },
-                new Object[] { ShippingDraft.builder()
-                        .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { ShippingDraft.builder()
+        return new Object[][] { new Object[] { "key", ShippingDraft.builder().key("key") },
+                new Object[] { "shippingMethod",
+                        ShippingDraft.builder()
+                                .shippingMethod(
+                                    new com.commercetools.api.models.shipping_method.ShippingMethodReferenceImpl()) },
+                new Object[] { "shippingAddress",
+                        ShippingDraft.builder()
+                                .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "shippingRateInput", ShippingDraft.builder()
                         .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputDraftImpl()) },
-                new Object[] { ShippingDraft.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] {
+                new Object[] { "externalTaxRate",
+                        ShippingDraft.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "deliveries",
                         ShippingDraft.builder()
                                 .deliveries(Collections
                                         .singletonList(new com.commercetools.api.models.order.DeliveryDraftImpl())) },
-                new Object[] { ShippingDraft.builder()
+                new Object[] { "custom", ShippingDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ShippingInfoTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ShippingInfoTest.java
index 074f68ee233..fc30bba0adb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ShippingInfoTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ShippingInfoTest.java
@@ -3,48 +3,45 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingInfoBuilder builder) {
         ShippingInfo shippingInfo = builder.buildUnchecked();
         Assertions.assertThat(shippingInfo).isInstanceOf(ShippingInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingInfo.builder().shippingMethodName("shippingMethodName") },
-                new Object[] { ShippingInfo.builder()
-                        .price(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { ShippingInfo.builder()
-                        .shippingRate(new com.commercetools.api.models.shipping_method.ShippingRateImpl()) },
-                new Object[] {
+        return new Object[][] {
+                new Object[] { "shippingMethodName", ShippingInfo.builder().shippingMethodName("shippingMethodName") },
+                new Object[] { "price",
+                        ShippingInfo.builder()
+                                .price(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "shippingRate",
+                        ShippingInfo.builder()
+                                .shippingRate(new com.commercetools.api.models.shipping_method.ShippingRateImpl()) },
+                new Object[] { "taxedPrice",
                         ShippingInfo.builder().taxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) },
-                new Object[] {
+                new Object[] { "taxRate",
                         ShippingInfo.builder().taxRate(new com.commercetools.api.models.tax_category.TaxRateImpl()) },
-                new Object[] { ShippingInfo.builder()
+                new Object[] { "taxCategory", ShippingInfo.builder()
                         .taxCategory(new com.commercetools.api.models.tax_category.TaxCategoryReferenceImpl()) },
-                new Object[] { ShippingInfo.builder()
-                        .shippingMethod(
-                            new com.commercetools.api.models.shipping_method.ShippingMethodReferenceImpl()) },
-                new Object[] { ShippingInfo.builder()
+                new Object[] { "shippingMethod",
+                        ShippingInfo.builder()
+                                .shippingMethod(
+                                    new com.commercetools.api.models.shipping_method.ShippingMethodReferenceImpl()) },
+                new Object[] { "deliveries", ShippingInfo.builder()
                         .deliveries(Collections.singletonList(new com.commercetools.api.models.order.DeliveryImpl())) },
-                new Object[] { ShippingInfo.builder()
-                        .discountedPrice(new com.commercetools.api.models.cart.DiscountedLineItemPriceImpl()) },
-                new Object[] { ShippingInfo.builder()
+                new Object[] { "discountedPrice",
+                        ShippingInfo.builder()
+                                .discountedPrice(new com.commercetools.api.models.cart.DiscountedLineItemPriceImpl()) },
+                new Object[] { "shippingMethodState", ShippingInfo.builder()
                         .shippingMethodState(
                             com.commercetools.api.models.cart.ShippingMethodState.findEnum("DoesNotMatchCart")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ShippingTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ShippingTest.java
index ce1dba911ea..b07ee45380e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ShippingTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/ShippingTest.java
@@ -1,37 +1,30 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingBuilder builder) {
         Shipping shipping = builder.buildUnchecked();
         Assertions.assertThat(shipping).isInstanceOf(Shipping.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Shipping.builder().shippingKey("shippingKey") },
-                new Object[] {
+        return new Object[][] { new Object[] { "shippingKey", Shipping.builder().shippingKey("shippingKey") },
+                new Object[] { "shippingInfo",
                         Shipping.builder().shippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) },
-                new Object[] {
+                new Object[] { "shippingAddress",
                         Shipping.builder().shippingAddress(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { Shipping.builder()
-                        .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
-                new Object[] { Shipping.builder()
+                new Object[] { "shippingRateInput",
+                        Shipping.builder()
+                                .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
+                new Object[] { "shippingCustomFields", Shipping.builder()
                         .shippingCustomFields(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/StackingTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/StackingTest.java
index 7e46b2411b8..edda6f671e0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/StackingTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/StackingTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StackingTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxPortionDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxPortionDraftTest.java
index faf0d86bb46..06a014b8dc7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxPortionDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxPortionDraftTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxPortionDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxPortionDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxPortionDraftBuilder builder) {
         TaxPortionDraft taxPortionDraft = builder.buildUnchecked();
         Assertions.assertThat(taxPortionDraft).isInstanceOf(TaxPortionDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxPortionDraft.builder().name("name") },
-                new Object[] { TaxPortionDraft.builder().rate(0.45292872) }, new Object[] {
+        return new Object[][] { new Object[] { "name", TaxPortionDraft.builder().name("name") },
+                new Object[] { "rate", TaxPortionDraft.builder().rate(0.45292872) }, new Object[] { "amount",
                         TaxPortionDraft.builder().amount(new com.commercetools.api.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxPortionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxPortionTest.java
index bc0956c48bc..a1a3c674ffc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxPortionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxPortionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.cart;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxPortionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxPortionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxPortionBuilder builder) {
         TaxPortion taxPortion = builder.buildUnchecked();
         Assertions.assertThat(taxPortion).isInstanceOf(TaxPortion.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxPortion.builder().name("name") },
-                new Object[] { TaxPortion.builder().rate(0.45292872) }, new Object[] { TaxPortion.builder()
+        return new Object[][] { new Object[] { "name", TaxPortion.builder().name("name") },
+                new Object[] { "rate", TaxPortion.builder().rate(0.45292872) },
+                new Object[] { "amount", TaxPortion.builder()
                         .amount(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxedItemPriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxedItemPriceTest.java
index 5889a4e85f3..44f16378a4d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxedItemPriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxedItemPriceTest.java
@@ -3,39 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxedItemPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxedItemPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxedItemPriceBuilder builder) {
         TaxedItemPrice taxedItemPrice = builder.buildUnchecked();
         Assertions.assertThat(taxedItemPrice).isInstanceOf(TaxedItemPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { TaxedItemPrice.builder()
-                        .totalNet(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { TaxedItemPrice.builder()
-                        .totalGross(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] {
+                new Object[] { "totalNet",
+                        TaxedItemPrice.builder()
+                                .totalNet(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "totalGross",
+                        TaxedItemPrice.builder()
+                                .totalGross(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "taxPortions",
                         TaxedItemPrice.builder()
                                 .taxPortions(Collections
                                         .singletonList(new com.commercetools.api.models.cart.TaxPortionImpl())) },
-                new Object[] { TaxedItemPrice.builder()
+                new Object[] { "totalTax", TaxedItemPrice.builder()
                         .totalTax(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxedPriceDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxedPriceDraftTest.java
index 2809df1beae..096927dafd8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxedPriceDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxedPriceDraftTest.java
@@ -3,39 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxedPriceDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxedPriceDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxedPriceDraftBuilder builder) {
         TaxedPriceDraft taxedPriceDraft = builder.buildUnchecked();
         Assertions.assertThat(taxedPriceDraft).isInstanceOf(TaxedPriceDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "totalNet",
                         TaxedPriceDraft.builder().totalNet(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] {
+                new Object[] { "totalGross",
                         TaxedPriceDraft.builder().totalGross(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] {
+                new Object[] { "taxPortions",
                         TaxedPriceDraft.builder()
                                 .taxPortions(Collections
                                         .singletonList(new com.commercetools.api.models.cart.TaxPortionDraftImpl())) },
-                new Object[] { TaxedPriceDraft.builder()
+                new Object[] { "totalTax", TaxedPriceDraft.builder()
                         .totalTax(new com.commercetools.api.models.common.TypedMoneyDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxedPriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxedPriceTest.java
index 88510d25837..b23a6a591a6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxedPriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart/TaxedPriceTest.java
@@ -3,39 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxedPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxedPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxedPriceBuilder builder) {
         TaxedPrice taxedPrice = builder.buildUnchecked();
         Assertions.assertThat(taxedPrice).isInstanceOf(TaxedPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { TaxedPrice.builder()
-                        .totalNet(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { TaxedPrice.builder()
-                        .totalGross(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] {
+                new Object[] { "totalNet",
+                        TaxedPrice.builder()
+                                .totalNet(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "totalGross",
+                        TaxedPrice.builder()
+                                .totalGross(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "taxPortions",
                         TaxedPrice.builder()
                                 .taxPortions(Collections
                                         .singletonList(new com.commercetools.api.models.cart.TaxPortionImpl())) },
-                new Object[] { TaxedPrice.builder()
+                new Object[] { "totalTax", TaxedPrice.builder()
                         .totalTax(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountAddStoreActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountAddStoreActionTest.java
index b4f6e1a40a5..da5a71ee2a4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountAddStoreActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountAddStoreActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountAddStoreActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountAddStoreActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountAddStoreActionBuilder builder) {
         CartDiscountAddStoreAction cartDiscountAddStoreAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountAddStoreAction).isInstanceOf(CartDiscountAddStoreAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountAddStoreAction.builder()
+        return new Object[][] { new Object[] { "store", CartDiscountAddStoreAction.builder()
                 .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeCartPredicateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeCartPredicateActionTest.java
index 07054f9025c..fd8e0688dd7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeCartPredicateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeCartPredicateActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountChangeCartPredicateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountChangeCartPredicateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountChangeCartPredicateActionBuilder builder) {
         CartDiscountChangeCartPredicateAction cartDiscountChangeCartPredicateAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountChangeCartPredicateAction)
                 .isInstanceOf(CartDiscountChangeCartPredicateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { CartDiscountChangeCartPredicateAction.builder().cartPredicate("cartPredicate") } };
+        return new Object[][] { new Object[] { "cartPredicate",
+                CartDiscountChangeCartPredicateAction.builder().cartPredicate("cartPredicate") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeIsActiveActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeIsActiveActionTest.java
index 028dd9c7844..aa727db7442 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeIsActiveActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeIsActiveActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountChangeIsActiveActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountChangeIsActiveActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountChangeIsActiveActionBuilder builder) {
         CartDiscountChangeIsActiveAction cartDiscountChangeIsActiveAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountChangeIsActiveAction).isInstanceOf(CartDiscountChangeIsActiveAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountChangeIsActiveAction.builder().isActive(true) } };
+        return new Object[][] {
+                new Object[] { "isActive", CartDiscountChangeIsActiveAction.builder().isActive(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeNameActionTest.java
index c43945617d1..d1a36b9af94 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountChangeNameActionBuilder builder) {
         CartDiscountChangeNameAction cartDiscountChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountChangeNameAction).isInstanceOf(CartDiscountChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountChangeNameAction.builder()
+        return new Object[][] { new Object[] { "name", CartDiscountChangeNameAction.builder()
                 .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeRequiresDiscountCodeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeRequiresDiscountCodeActionTest.java
index 50641a65444..987f72908f2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeRequiresDiscountCodeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeRequiresDiscountCodeActionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountChangeRequiresDiscountCodeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountChangeRequiresDiscountCodeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountChangeRequiresDiscountCodeActionBuilder builder) {
         CartDiscountChangeRequiresDiscountCodeAction cartDiscountChangeRequiresDiscountCodeAction = builder
                 .buildUnchecked();
         Assertions.assertThat(cartDiscountChangeRequiresDiscountCodeAction)
                 .isInstanceOf(CartDiscountChangeRequiresDiscountCodeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { CartDiscountChangeRequiresDiscountCodeAction.builder().requiresDiscountCode(true) } };
+        return new Object[][] { new Object[] { "requiresDiscountCode",
+                CartDiscountChangeRequiresDiscountCodeAction.builder().requiresDiscountCode(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeSortOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeSortOrderActionTest.java
index 8c471651d04..195dd26a825 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeSortOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeSortOrderActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountChangeSortOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountChangeSortOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountChangeSortOrderActionBuilder builder) {
         CartDiscountChangeSortOrderAction cartDiscountChangeSortOrderAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountChangeSortOrderAction).isInstanceOf(CartDiscountChangeSortOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountChangeSortOrderAction.builder().sortOrder("sortOrder") } };
+        return new Object[][] {
+                new Object[] { "sortOrder", CartDiscountChangeSortOrderAction.builder().sortOrder("sortOrder") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeStackingModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeStackingModeActionTest.java
index 8d590a8b87c..5a81fbc9de9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeStackingModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeStackingModeActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountChangeStackingModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountChangeStackingModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountChangeStackingModeActionBuilder builder) {
         CartDiscountChangeStackingModeAction cartDiscountChangeStackingModeAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountChangeStackingModeAction)
                 .isInstanceOf(CartDiscountChangeStackingModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountChangeStackingModeAction.builder()
+        return new Object[][] { new Object[] { "stackingMode", CartDiscountChangeStackingModeAction.builder()
                 .stackingMode(com.commercetools.api.models.cart_discount.StackingMode.findEnum("Stacking")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeTargetActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeTargetActionTest.java
index d50c31d20dc..042c6a3f6ae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeTargetActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeTargetActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountChangeTargetActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountChangeTargetActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountChangeTargetActionBuilder builder) {
         CartDiscountChangeTargetAction cartDiscountChangeTargetAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountChangeTargetAction).isInstanceOf(CartDiscountChangeTargetAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountChangeTargetAction.builder()
+        return new Object[][] { new Object[] { "target", CartDiscountChangeTargetAction.builder()
                 .target(new com.commercetools.api.models.cart_discount.CartDiscountTargetImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeValueActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeValueActionTest.java
index 1c314ad23e3..4510612ec90 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeValueActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountChangeValueActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountChangeValueActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountChangeValueActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountChangeValueActionBuilder builder) {
         CartDiscountChangeValueAction cartDiscountChangeValueAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountChangeValueAction).isInstanceOf(CartDiscountChangeValueAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountChangeValueAction.builder()
+        return new Object[][] { new Object[] { "value", CartDiscountChangeValueAction.builder()
                 .value(new com.commercetools.api.models.cart_discount.CartDiscountValueDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountCustomLineItemsTargetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountCustomLineItemsTargetTest.java
index 6cf95f9280e..1a66484013d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountCustomLineItemsTargetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountCustomLineItemsTargetTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountCustomLineItemsTargetTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountCustomLineItemsTargetBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountCustomLineItemsTargetBuilder builder) {
         CartDiscountCustomLineItemsTarget cartDiscountCustomLineItemsTarget = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountCustomLineItemsTarget).isInstanceOf(CartDiscountCustomLineItemsTarget.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountCustomLineItemsTarget.builder().predicate("predicate") } };
+        return new Object[][] {
+                new Object[] { "predicate", CartDiscountCustomLineItemsTarget.builder().predicate("predicate") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountDraftTest.java
index 629daae8a8b..5ad417b43b6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountDraftTest.java
@@ -4,51 +4,50 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountDraftBuilder builder) {
         CartDiscountDraft cartDiscountDraft = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountDraft).isInstanceOf(CartDiscountDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartDiscountDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CartDiscountDraft.builder().key("key") },
-                new Object[] { CartDiscountDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CartDiscountDraft.builder()
-                        .value(new com.commercetools.api.models.cart_discount.CartDiscountValueDraftImpl()) },
-                new Object[] { CartDiscountDraft.builder().cartPredicate("cartPredicate") },
-                new Object[] { CartDiscountDraft.builder()
-                        .target(new com.commercetools.api.models.cart_discount.CartDiscountTargetImpl()) },
-                new Object[] { CartDiscountDraft.builder().sortOrder("sortOrder") },
-                new Object[] { CartDiscountDraft.builder()
-                        .stores(Collections
-                                .singletonList(new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) },
-                new Object[] { CartDiscountDraft.builder().isActive(true) },
-                new Object[] { CartDiscountDraft.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CartDiscountDraft.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CartDiscountDraft.builder().requiresDiscountCode(true) },
-                new Object[] { CartDiscountDraft.builder()
+                new Object[] { "name",
+                        CartDiscountDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "key", CartDiscountDraft.builder().key("key") },
+                new Object[] { "description",
+                        CartDiscountDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "value",
+                        CartDiscountDraft.builder()
+                                .value(new com.commercetools.api.models.cart_discount.CartDiscountValueDraftImpl()) },
+                new Object[] { "cartPredicate", CartDiscountDraft.builder().cartPredicate("cartPredicate") },
+                new Object[] { "target",
+                        CartDiscountDraft.builder()
+                                .target(new com.commercetools.api.models.cart_discount.CartDiscountTargetImpl()) },
+                new Object[] { "sortOrder", CartDiscountDraft.builder().sortOrder("sortOrder") },
+                new Object[] { "stores",
+                        CartDiscountDraft.builder()
+                                .stores(Collections.singletonList(
+                                    new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) },
+                new Object[] { "isActive", CartDiscountDraft.builder().isActive(true) },
+                new Object[] { "validFrom",
+                        CartDiscountDraft.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        CartDiscountDraft.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "requiresDiscountCode", CartDiscountDraft.builder().requiresDiscountCode(true) },
+                new Object[] { "stackingMode", CartDiscountDraft.builder()
                         .stackingMode(com.commercetools.api.models.cart_discount.StackingMode.findEnum("Stacking")) },
-                new Object[] { CartDiscountDraft.builder()
+                new Object[] { "custom", CartDiscountDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountLineItemsTargetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountLineItemsTargetTest.java
index 334382c27c6..1a2af8cd8fe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountLineItemsTargetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountLineItemsTargetTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountLineItemsTargetTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountLineItemsTargetBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountLineItemsTargetBuilder builder) {
         CartDiscountLineItemsTarget cartDiscountLineItemsTarget = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountLineItemsTarget).isInstanceOf(CartDiscountLineItemsTarget.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountLineItemsTarget.builder().predicate("predicate") } };
+        return new Object[][] {
+                new Object[] { "predicate", CartDiscountLineItemsTarget.builder().predicate("predicate") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPagedQueryResponseTest.java
index 64dcdff517c..ea6eb20f4ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountPagedQueryResponseBuilder builder) {
         CartDiscountPagedQueryResponse cartDiscountPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountPagedQueryResponse).isInstanceOf(CartDiscountPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountPagedQueryResponse.builder().limit(7L) },
-                new Object[] { CartDiscountPagedQueryResponse.builder().offset(3L) },
-                new Object[] { CartDiscountPagedQueryResponse.builder().count(2L) },
-                new Object[] { CartDiscountPagedQueryResponse.builder().total(1L) },
-                new Object[] { CartDiscountPagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.cart_discount.CartDiscountImpl())) } };
+        return new Object[][] { new Object[] { "limit", CartDiscountPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", CartDiscountPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", CartDiscountPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", CartDiscountPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        CartDiscountPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.cart_discount.CartDiscountImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTargetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTargetTest.java
index 98e06504e4e..ffcd121da38 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTargetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountPatternTargetTest.java
@@ -3,40 +3,35 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountPatternTargetTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountPatternTargetBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountPatternTargetBuilder builder) {
         CartDiscountPatternTarget cartDiscountPatternTarget = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountPatternTarget).isInstanceOf(CartDiscountPatternTarget.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartDiscountPatternTarget.builder()
-                        .triggerPattern(Collections.singletonList(
-                            new com.commercetools.api.models.cart_discount.PatternComponentImpl())) },
-                new Object[] { CartDiscountPatternTarget.builder()
-                        .targetPattern(Collections.singletonList(
-                            new com.commercetools.api.models.cart_discount.PatternComponentImpl())) },
-                new Object[] { CartDiscountPatternTarget.builder().maxOccurrence(7) },
-                new Object[] { CartDiscountPatternTarget.builder()
-                        .selectionMode(
-                            com.commercetools.api.models.cart_discount.SelectionMode.findEnum("Cheapest")) } };
+                new Object[] { "triggerPattern",
+                        CartDiscountPatternTarget.builder()
+                                .triggerPattern(Collections.singletonList(
+                                    new com.commercetools.api.models.cart_discount.PatternComponentImpl())) },
+                new Object[] { "targetPattern",
+                        CartDiscountPatternTarget.builder()
+                                .targetPattern(Collections.singletonList(
+                                    new com.commercetools.api.models.cart_discount.PatternComponentImpl())) },
+                new Object[] { "maxOccurrence", CartDiscountPatternTarget.builder().maxOccurrence(7) },
+                new Object[] { "selectionMode",
+                        CartDiscountPatternTarget.builder()
+                                .selectionMode(
+                                    com.commercetools.api.models.cart_discount.SelectionMode.findEnum("Cheapest")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountReferenceTest.java
index f3f339eb468..114c330394f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountReferenceBuilder builder) {
         CartDiscountReference cartDiscountReference = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountReference).isInstanceOf(CartDiscountReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartDiscountReference.builder()
-                        .obj(new com.commercetools.api.models.cart_discount.CartDiscountImpl()) },
-                new Object[] { CartDiscountReference.builder().id("id") } };
+                new Object[] { "obj",
+                        CartDiscountReference.builder()
+                                .obj(new com.commercetools.api.models.cart_discount.CartDiscountImpl()) },
+                new Object[] { "id", CartDiscountReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountRemoveStoreActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountRemoveStoreActionTest.java
index 516cc3a590e..14364020d6f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountRemoveStoreActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountRemoveStoreActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountRemoveStoreActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountRemoveStoreActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountRemoveStoreActionBuilder builder) {
         CartDiscountRemoveStoreAction cartDiscountRemoveStoreAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountRemoveStoreAction).isInstanceOf(CartDiscountRemoveStoreAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountRemoveStoreAction.builder()
+        return new Object[][] { new Object[] { "store", CartDiscountRemoveStoreAction.builder()
                 .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountResourceIdentifierTest.java
index 6d3e7a715c9..0a438faf5ea 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountResourceIdentifierBuilder builder) {
         CartDiscountResourceIdentifier cartDiscountResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountResourceIdentifier).isInstanceOf(CartDiscountResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountResourceIdentifier.builder().id("id") },
-                new Object[] { CartDiscountResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", CartDiscountResourceIdentifier.builder().id("id") },
+                new Object[] { "key", CartDiscountResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetCustomFieldActionTest.java
index a34ec56997c..3b8057ae8eb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountSetCustomFieldActionBuilder builder) {
         CartDiscountSetCustomFieldAction cartDiscountSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountSetCustomFieldAction).isInstanceOf(CartDiscountSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountSetCustomFieldAction.builder().name("name") },
-                new Object[] { CartDiscountSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", CartDiscountSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CartDiscountSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetCustomTypeActionTest.java
index 8cac860a1bc..4cf34369d5f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountSetCustomTypeActionBuilder builder) {
         CartDiscountSetCustomTypeAction cartDiscountSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountSetCustomTypeAction).isInstanceOf(CartDiscountSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartDiscountSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CartDiscountSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        CartDiscountSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CartDiscountSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetDescriptionActionTest.java
index 32003e416d5..2074cab4739 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetDescriptionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountSetDescriptionActionBuilder builder) {
         CartDiscountSetDescriptionAction cartDiscountSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountSetDescriptionAction).isInstanceOf(CartDiscountSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountSetDescriptionAction.builder()
+        return new Object[][] { new Object[] { "description", CartDiscountSetDescriptionAction.builder()
                 .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetKeyActionTest.java
index 38da7ab2f4c..717ae3097eb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountSetKeyActionBuilder builder) {
         CartDiscountSetKeyAction cartDiscountSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountSetKeyAction).isInstanceOf(CartDiscountSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", CartDiscountSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetStoresActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetStoresActionTest.java
index d6ed34ba358..59066bd87d5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetStoresActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetStoresActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountSetStoresActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountSetStoresActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountSetStoresActionBuilder builder) {
         CartDiscountSetStoresAction cartDiscountSetStoresAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountSetStoresAction).isInstanceOf(CartDiscountSetStoresAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountSetStoresAction.builder()
-                .stores(Collections
-                        .singletonList(new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) } };
+        return new Object[][] { new Object[] { "stores",
+                CartDiscountSetStoresAction.builder()
+                        .stores(Collections.singletonList(
+                            new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetValidFromActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetValidFromActionTest.java
index 49fe32ccf6e..7b2b3d705de 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetValidFromActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetValidFromActionTest.java
@@ -3,30 +3,22 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountSetValidFromActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountSetValidFromActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountSetValidFromActionBuilder builder) {
         CartDiscountSetValidFromAction cartDiscountSetValidFromAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountSetValidFromAction).isInstanceOf(CartDiscountSetValidFromAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "validFrom",
                 CartDiscountSetValidFromAction.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetValidFromAndUntilActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetValidFromAndUntilActionTest.java
index fc1bb60bda8..f38791775fc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetValidFromAndUntilActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetValidFromAndUntilActionTest.java
@@ -3,34 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountSetValidFromAndUntilActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountSetValidFromAndUntilActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountSetValidFromAndUntilActionBuilder builder) {
         CartDiscountSetValidFromAndUntilAction cartDiscountSetValidFromAndUntilAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountSetValidFromAndUntilAction)
                 .isInstanceOf(CartDiscountSetValidFromAndUntilAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartDiscountSetValidFromAndUntilAction.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CartDiscountSetValidFromAndUntilAction.builder()
+                new Object[] { "validFrom",
+                        CartDiscountSetValidFromAndUntilAction.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil", CartDiscountSetValidFromAndUntilAction.builder()
                         .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetValidUntilActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetValidUntilActionTest.java
index faca308bbb5..e5c57136265 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetValidUntilActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountSetValidUntilActionTest.java
@@ -3,30 +3,22 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountSetValidUntilActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountSetValidUntilActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountSetValidUntilActionBuilder builder) {
         CartDiscountSetValidUntilAction cartDiscountSetValidUntilAction = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountSetValidUntilAction).isInstanceOf(CartDiscountSetValidUntilAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "validUntil",
                 CartDiscountSetValidUntilAction.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountShippingCostTargetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountShippingCostTargetTest.java
index d4c095ba458..232ef6c7828 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountShippingCostTargetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountShippingCostTargetTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountShippingCostTargetTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountTest.java
index 3e61b638ba0..4f71e0aedc9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountTest.java
@@ -4,62 +4,63 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountBuilder builder) {
         CartDiscount cartDiscount = builder.buildUnchecked();
         Assertions.assertThat(cartDiscount).isInstanceOf(CartDiscount.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscount.builder().id("id") },
-                new Object[] { CartDiscount.builder().version(2L) },
-                new Object[] { CartDiscount.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CartDiscount.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CartDiscount.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", CartDiscount.builder().id("id") },
+                new Object[] { "version", CartDiscount.builder().version(2L) },
+                new Object[] { "createdAt",
+                        CartDiscount.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        CartDiscount.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        CartDiscount.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         CartDiscount.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] {
+                new Object[] { "name",
                         CartDiscount.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CartDiscount.builder().key("key") },
-                new Object[] { CartDiscount.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CartDiscount.builder()
-                        .value(new com.commercetools.api.models.cart_discount.CartDiscountValueImpl()) },
-                new Object[] { CartDiscount.builder().cartPredicate("cartPredicate") },
-                new Object[] { CartDiscount.builder()
-                        .target(new com.commercetools.api.models.cart_discount.CartDiscountTargetImpl()) },
-                new Object[] { CartDiscount.builder().sortOrder("sortOrder") },
-                new Object[] { CartDiscount.builder()
-                        .stores(Collections
-                                .singletonList(new com.commercetools.api.models.store.StoreKeyReferenceImpl())) },
-                new Object[] { CartDiscount.builder().isActive(true) },
-                new Object[] { CartDiscount.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CartDiscount.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CartDiscount.builder().requiresDiscountCode(true) },
-                new Object[] {
+                new Object[] { "key", CartDiscount.builder().key("key") },
+                new Object[] { "description",
+                        CartDiscount.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "value",
+                        CartDiscount.builder()
+                                .value(new com.commercetools.api.models.cart_discount.CartDiscountValueImpl()) },
+                new Object[] { "cartPredicate", CartDiscount.builder().cartPredicate("cartPredicate") },
+                new Object[] { "target",
+                        CartDiscount.builder()
+                                .target(new com.commercetools.api.models.cart_discount.CartDiscountTargetImpl()) },
+                new Object[] { "sortOrder", CartDiscount.builder().sortOrder("sortOrder") },
+                new Object[] { "stores",
+                        CartDiscount.builder()
+                                .stores(Collections.singletonList(
+                                    new com.commercetools.api.models.store.StoreKeyReferenceImpl())) },
+                new Object[] { "isActive", CartDiscount.builder().isActive(true) },
+                new Object[] { "validFrom",
+                        CartDiscount.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        CartDiscount.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "requiresDiscountCode", CartDiscount.builder().requiresDiscountCode(true) },
+                new Object[] { "references",
                         CartDiscount.builder()
                                 .references(Collections
                                         .singletonList(new com.commercetools.api.models.common.ReferenceImpl())) },
-                new Object[] { CartDiscount.builder()
+                new Object[] { "stackingMode", CartDiscount.builder()
                         .stackingMode(com.commercetools.api.models.cart_discount.StackingMode.findEnum("Stacking")) },
-                new Object[] {
+                new Object[] { "custom",
                         CartDiscount.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountTotalPriceTargetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountTotalPriceTargetTest.java
index 0f2daea2259..c06473c5001 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountTotalPriceTargetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountTotalPriceTargetTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountTotalPriceTargetTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountUpdateTest.java
index 112c6783697..84d2e322e62 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountUpdateBuilder builder) {
         CartDiscountUpdate cartDiscountUpdate = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountUpdate).isInstanceOf(CartDiscountUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountUpdate.builder().version(2L) },
-                new Object[] { CartDiscountUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.cart_discount.CartDiscountUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", CartDiscountUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        CartDiscountUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.cart_discount.CartDiscountUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueAbsoluteDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueAbsoluteDraftTest.java
index af73250367e..877b0fb0f1e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueAbsoluteDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueAbsoluteDraftTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountValueAbsoluteDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountValueAbsoluteDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountValueAbsoluteDraftBuilder builder) {
         CartDiscountValueAbsoluteDraft cartDiscountValueAbsoluteDraft = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountValueAbsoluteDraft).isInstanceOf(CartDiscountValueAbsoluteDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartDiscountValueAbsoluteDraft.builder()
+                new Object[] { "money", CartDiscountValueAbsoluteDraft.builder()
                         .money(Collections.singletonList(new com.commercetools.api.models.common.MoneyImpl())) },
-                new Object[] { CartDiscountValueAbsoluteDraft.builder()
-                        .applicationMode(com.commercetools.api.models.cart_discount.DiscountApplicationMode
-                                .findEnum("ProportionateDistribution")) } };
+                new Object[] { "applicationMode",
+                        CartDiscountValueAbsoluteDraft.builder()
+                                .applicationMode(com.commercetools.api.models.cart_discount.DiscountApplicationMode
+                                        .findEnum("ProportionateDistribution")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueAbsoluteTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueAbsoluteTest.java
index e30889be093..4b8783a528c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueAbsoluteTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueAbsoluteTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountValueAbsoluteTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountValueAbsoluteBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountValueAbsoluteBuilder builder) {
         CartDiscountValueAbsolute cartDiscountValueAbsolute = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountValueAbsolute).isInstanceOf(CartDiscountValueAbsolute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartDiscountValueAbsolute.builder()
-                        .money(Collections
-                                .singletonList(new com.commercetools.api.models.common.CentPrecisionMoneyImpl())) },
-                new Object[] { CartDiscountValueAbsolute.builder()
-                        .applicationMode(com.commercetools.api.models.cart_discount.DiscountApplicationMode
-                                .findEnum("ProportionateDistribution")) } };
+                new Object[] { "money",
+                        CartDiscountValueAbsolute.builder()
+                                .money(Collections.singletonList(
+                                    new com.commercetools.api.models.common.CentPrecisionMoneyImpl())) },
+                new Object[] { "applicationMode",
+                        CartDiscountValueAbsolute.builder()
+                                .applicationMode(com.commercetools.api.models.cart_discount.DiscountApplicationMode
+                                        .findEnum("ProportionateDistribution")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueFixedDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueFixedDraftTest.java
index 4e04f075fcf..20e3a030ede 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueFixedDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueFixedDraftTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountValueFixedDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountValueFixedDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountValueFixedDraftBuilder builder) {
         CartDiscountValueFixedDraft cartDiscountValueFixedDraft = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountValueFixedDraft).isInstanceOf(CartDiscountValueFixedDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartDiscountValueFixedDraft.builder()
+                new Object[] { "money", CartDiscountValueFixedDraft.builder()
                         .money(Collections.singletonList(new com.commercetools.api.models.common.MoneyImpl())) },
-                new Object[] { CartDiscountValueFixedDraft.builder()
-                        .applicationMode(com.commercetools.api.models.cart_discount.DiscountApplicationMode
-                                .findEnum("ProportionateDistribution")) } };
+                new Object[] { "applicationMode",
+                        CartDiscountValueFixedDraft.builder()
+                                .applicationMode(com.commercetools.api.models.cart_discount.DiscountApplicationMode
+                                        .findEnum("ProportionateDistribution")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueFixedTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueFixedTest.java
index 670502ecb11..5103cd9f72b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueFixedTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueFixedTest.java
@@ -3,35 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountValueFixedTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountValueFixedBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountValueFixedBuilder builder) {
         CartDiscountValueFixed cartDiscountValueFixed = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountValueFixed).isInstanceOf(CartDiscountValueFixed.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartDiscountValueFixed.builder()
-                        .money(Collections.singletonList(new com.commercetools.api.models.common.TypedMoneyImpl())) },
-                new Object[] { CartDiscountValueFixed.builder()
-                        .applicationMode(com.commercetools.api.models.cart_discount.DiscountApplicationMode
-                                .findEnum("ProportionateDistribution")) } };
+                new Object[] { "money",
+                        CartDiscountValueFixed.builder()
+                                .money(Collections
+                                        .singletonList(new com.commercetools.api.models.common.TypedMoneyImpl())) },
+                new Object[] { "applicationMode",
+                        CartDiscountValueFixed.builder()
+                                .applicationMode(com.commercetools.api.models.cart_discount.DiscountApplicationMode
+                                        .findEnum("ProportionateDistribution")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueGiftLineItemDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueGiftLineItemDraftTest.java
index 018805ead52..883989477a0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueGiftLineItemDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueGiftLineItemDraftTest.java
@@ -1,39 +1,33 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountValueGiftLineItemDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountValueGiftLineItemDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountValueGiftLineItemDraftBuilder builder) {
         CartDiscountValueGiftLineItemDraft cartDiscountValueGiftLineItemDraft = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountValueGiftLineItemDraft)
                 .isInstanceOf(CartDiscountValueGiftLineItemDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartDiscountValueGiftLineItemDraft.builder()
-                        .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
-                new Object[] { CartDiscountValueGiftLineItemDraft.builder().variantId(5L) },
-                new Object[] { CartDiscountValueGiftLineItemDraft.builder()
+                new Object[] { "product",
+                        CartDiscountValueGiftLineItemDraft.builder()
+                                .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
+                new Object[] { "variantId", CartDiscountValueGiftLineItemDraft.builder().variantId(5L) },
+                new Object[] { "supplyChannel", CartDiscountValueGiftLineItemDraft.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { CartDiscountValueGiftLineItemDraft.builder()
-                        .distributionChannel(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
+                new Object[] { "distributionChannel",
+                        CartDiscountValueGiftLineItemDraft.builder()
+                                .distributionChannel(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueGiftLineItemTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueGiftLineItemTest.java
index 2e19e383700..a29cf7233b3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueGiftLineItemTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueGiftLineItemTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountValueGiftLineItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountValueGiftLineItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountValueGiftLineItemBuilder builder) {
         CartDiscountValueGiftLineItem cartDiscountValueGiftLineItem = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountValueGiftLineItem).isInstanceOf(CartDiscountValueGiftLineItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CartDiscountValueGiftLineItem.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { CartDiscountValueGiftLineItem.builder().variantId(5L) },
-                new Object[] { CartDiscountValueGiftLineItem.builder()
-                        .supplyChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
-                new Object[] { CartDiscountValueGiftLineItem.builder()
+                new Object[] { "product",
+                        CartDiscountValueGiftLineItem.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantId", CartDiscountValueGiftLineItem.builder().variantId(5L) },
+                new Object[] { "supplyChannel",
+                        CartDiscountValueGiftLineItem.builder()
+                                .supplyChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
+                new Object[] { "distributionChannel", CartDiscountValueGiftLineItem.builder()
                         .distributionChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueRelativeDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueRelativeDraftTest.java
index f97660782a4..fa5dd033d7c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueRelativeDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueRelativeDraftTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountValueRelativeDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountValueRelativeDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountValueRelativeDraftBuilder builder) {
         CartDiscountValueRelativeDraft cartDiscountValueRelativeDraft = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountValueRelativeDraft).isInstanceOf(CartDiscountValueRelativeDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountValueRelativeDraft.builder().permyriad(1L) } };
+        return new Object[][] { new Object[] { "permyriad", CartDiscountValueRelativeDraft.builder().permyriad(1L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueRelativeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueRelativeTest.java
index 4f1ca227d68..1580d7524e4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueRelativeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CartDiscountValueRelativeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountValueRelativeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountValueRelativeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountValueRelativeBuilder builder) {
         CartDiscountValueRelative cartDiscountValueRelative = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountValueRelative).isInstanceOf(CartDiscountValueRelative.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountValueRelative.builder().permyriad(1L) } };
+        return new Object[][] { new Object[] { "permyriad", CartDiscountValueRelative.builder().permyriad(1L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnitsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnitsTest.java
index df5ab00086e..ce819d69025 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnitsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CountOnCustomLineItemUnitsTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CountOnCustomLineItemUnitsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CountOnCustomLineItemUnitsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CountOnCustomLineItemUnitsBuilder builder) {
         CountOnCustomLineItemUnits countOnCustomLineItemUnits = builder.buildUnchecked();
         Assertions.assertThat(countOnCustomLineItemUnits).isInstanceOf(CountOnCustomLineItemUnits.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CountOnCustomLineItemUnits.builder().predicate("predicate") },
-                new Object[] { CountOnCustomLineItemUnits.builder().minCount(1) },
-                new Object[] { CountOnCustomLineItemUnits.builder().maxCount(8) },
-                new Object[] { CountOnCustomLineItemUnits.builder().excludeCount(4) } };
+        return new Object[][] {
+                new Object[] { "predicate", CountOnCustomLineItemUnits.builder().predicate("predicate") },
+                new Object[] { "minCount", CountOnCustomLineItemUnits.builder().minCount(1) },
+                new Object[] { "maxCount", CountOnCustomLineItemUnits.builder().maxCount(8) },
+                new Object[] { "excludeCount", CountOnCustomLineItemUnits.builder().excludeCount(4) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnitsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnitsTest.java
index b7116828f9f..4bea27fe025 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnitsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/CountOnLineItemUnitsTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CountOnLineItemUnitsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CountOnLineItemUnitsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CountOnLineItemUnitsBuilder builder) {
         CountOnLineItemUnits countOnLineItemUnits = builder.buildUnchecked();
         Assertions.assertThat(countOnLineItemUnits).isInstanceOf(CountOnLineItemUnits.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CountOnLineItemUnits.builder().predicate("predicate") },
-                new Object[] { CountOnLineItemUnits.builder().minCount(1) },
-                new Object[] { CountOnLineItemUnits.builder().maxCount(8) },
-                new Object[] { CountOnLineItemUnits.builder().excludeCount(4) } };
+        return new Object[][] { new Object[] { "predicate", CountOnLineItemUnits.builder().predicate("predicate") },
+                new Object[] { "minCount", CountOnLineItemUnits.builder().minCount(1) },
+                new Object[] { "maxCount", CountOnLineItemUnits.builder().maxCount(8) },
+                new Object[] { "excludeCount", CountOnLineItemUnits.builder().excludeCount(4) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/MultiBuyCustomLineItemsTargetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/MultiBuyCustomLineItemsTargetTest.java
index 47880891ef4..1fd4979fa80 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/MultiBuyCustomLineItemsTargetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/MultiBuyCustomLineItemsTargetTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MultiBuyCustomLineItemsTargetTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MultiBuyCustomLineItemsTargetBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MultiBuyCustomLineItemsTargetBuilder builder) {
         MultiBuyCustomLineItemsTarget multiBuyCustomLineItemsTarget = builder.buildUnchecked();
         Assertions.assertThat(multiBuyCustomLineItemsTarget).isInstanceOf(MultiBuyCustomLineItemsTarget.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MultiBuyCustomLineItemsTarget.builder().predicate("predicate") },
-                new Object[] { MultiBuyCustomLineItemsTarget.builder().triggerQuantity(8) },
-                new Object[] { MultiBuyCustomLineItemsTarget.builder().discountedQuantity(3) },
-                new Object[] { MultiBuyCustomLineItemsTarget.builder().maxOccurrence(7) },
-                new Object[] { MultiBuyCustomLineItemsTarget.builder()
-                        .selectionMode(
-                            com.commercetools.api.models.cart_discount.SelectionMode.findEnum("Cheapest")) } };
+        return new Object[][] {
+                new Object[] { "predicate", MultiBuyCustomLineItemsTarget.builder().predicate("predicate") },
+                new Object[] { "triggerQuantity", MultiBuyCustomLineItemsTarget.builder().triggerQuantity(8) },
+                new Object[] { "discountedQuantity", MultiBuyCustomLineItemsTarget.builder().discountedQuantity(3) },
+                new Object[] { "maxOccurrence", MultiBuyCustomLineItemsTarget.builder().maxOccurrence(7) },
+                new Object[] { "selectionMode",
+                        MultiBuyCustomLineItemsTarget.builder()
+                                .selectionMode(
+                                    com.commercetools.api.models.cart_discount.SelectionMode.findEnum("Cheapest")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/MultiBuyLineItemsTargetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/MultiBuyLineItemsTargetTest.java
index b87616992cf..54c96e95062 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/MultiBuyLineItemsTargetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/cart_discount/MultiBuyLineItemsTargetTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MultiBuyLineItemsTargetTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MultiBuyLineItemsTargetBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MultiBuyLineItemsTargetBuilder builder) {
         MultiBuyLineItemsTarget multiBuyLineItemsTarget = builder.buildUnchecked();
         Assertions.assertThat(multiBuyLineItemsTarget).isInstanceOf(MultiBuyLineItemsTarget.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MultiBuyLineItemsTarget.builder().predicate("predicate") },
-                new Object[] { MultiBuyLineItemsTarget.builder().triggerQuantity(8) },
-                new Object[] { MultiBuyLineItemsTarget.builder().discountedQuantity(3) },
-                new Object[] { MultiBuyLineItemsTarget.builder().maxOccurrence(7) },
-                new Object[] { MultiBuyLineItemsTarget.builder()
-                        .selectionMode(
-                            com.commercetools.api.models.cart_discount.SelectionMode.findEnum("Cheapest")) } };
+        return new Object[][] { new Object[] { "predicate", MultiBuyLineItemsTarget.builder().predicate("predicate") },
+                new Object[] { "triggerQuantity", MultiBuyLineItemsTarget.builder().triggerQuantity(8) },
+                new Object[] { "discountedQuantity", MultiBuyLineItemsTarget.builder().discountedQuantity(3) },
+                new Object[] { "maxOccurrence", MultiBuyLineItemsTarget.builder().maxOccurrence(7) },
+                new Object[] { "selectionMode",
+                        MultiBuyLineItemsTarget.builder()
+                                .selectionMode(
+                                    com.commercetools.api.models.cart_discount.SelectionMode.findEnum("Cheapest")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryAddAssetActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryAddAssetActionTest.java
index d128bbf8559..75b49f354cb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryAddAssetActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryAddAssetActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryAddAssetActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryAddAssetActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryAddAssetActionBuilder builder) {
         CategoryAddAssetAction categoryAddAssetAction = builder.buildUnchecked();
         Assertions.assertThat(categoryAddAssetAction).isInstanceOf(CategoryAddAssetAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CategoryAddAssetAction.builder()
-                        .asset(new com.commercetools.api.models.common.AssetDraftImpl()) },
-                new Object[] { CategoryAddAssetAction.builder().position(4) } };
+                new Object[] { "asset",
+                        CategoryAddAssetAction.builder()
+                                .asset(new com.commercetools.api.models.common.AssetDraftImpl()) },
+                new Object[] { "position", CategoryAddAssetAction.builder().position(4) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeAssetNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeAssetNameActionTest.java
index cfa018111a4..dc37d5e9b0a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeAssetNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeAssetNameActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryChangeAssetNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryChangeAssetNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryChangeAssetNameActionBuilder builder) {
         CategoryChangeAssetNameAction categoryChangeAssetNameAction = builder.buildUnchecked();
         Assertions.assertThat(categoryChangeAssetNameAction).isInstanceOf(CategoryChangeAssetNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategoryChangeAssetNameAction.builder().assetId("assetId") },
-                new Object[] { CategoryChangeAssetNameAction.builder().assetKey("assetKey") },
-                new Object[] { CategoryChangeAssetNameAction.builder()
+        return new Object[][] { new Object[] { "assetId", CategoryChangeAssetNameAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", CategoryChangeAssetNameAction.builder().assetKey("assetKey") },
+                new Object[] { "name", CategoryChangeAssetNameAction.builder()
                         .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeAssetOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeAssetOrderActionTest.java
index 2d1067894f9..41b18040339 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeAssetOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeAssetOrderActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryChangeAssetOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryChangeAssetOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryChangeAssetOrderActionBuilder builder) {
         CategoryChangeAssetOrderAction categoryChangeAssetOrderAction = builder.buildUnchecked();
         Assertions.assertThat(categoryChangeAssetOrderAction).isInstanceOf(CategoryChangeAssetOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "assetOrder",
                 CategoryChangeAssetOrderAction.builder().assetOrder(Collections.singletonList("assetOrder")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeNameActionTest.java
index a9408b2141c..e66382293d6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryChangeNameActionBuilder builder) {
         CategoryChangeNameAction categoryChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(categoryChangeNameAction).isInstanceOf(CategoryChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategoryChangeNameAction.builder()
+        return new Object[][] { new Object[] { "name", CategoryChangeNameAction.builder()
                 .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeOrderHintActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeOrderHintActionTest.java
index 5c8d96948b4..43d12dc9d0f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeOrderHintActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeOrderHintActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryChangeOrderHintActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryChangeOrderHintActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryChangeOrderHintActionBuilder builder) {
         CategoryChangeOrderHintAction categoryChangeOrderHintAction = builder.buildUnchecked();
         Assertions.assertThat(categoryChangeOrderHintAction).isInstanceOf(CategoryChangeOrderHintAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategoryChangeOrderHintAction.builder().orderHint("orderHint") } };
+        return new Object[][] {
+                new Object[] { "orderHint", CategoryChangeOrderHintAction.builder().orderHint("orderHint") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeParentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeParentActionTest.java
index 5ed7682a0a3..935e517dd5a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeParentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeParentActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryChangeParentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryChangeParentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryChangeParentActionBuilder builder) {
         CategoryChangeParentAction categoryChangeParentAction = builder.buildUnchecked();
         Assertions.assertThat(categoryChangeParentAction).isInstanceOf(CategoryChangeParentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategoryChangeParentAction.builder()
+        return new Object[][] { new Object[] { "parent", CategoryChangeParentAction.builder()
                 .parent(new com.commercetools.api.models.category.CategoryResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeSlugActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeSlugActionTest.java
index c1094d47fa7..1391a38208f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeSlugActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryChangeSlugActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryChangeSlugActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryChangeSlugActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryChangeSlugActionBuilder builder) {
         CategoryChangeSlugAction categoryChangeSlugAction = builder.buildUnchecked();
         Assertions.assertThat(categoryChangeSlugAction).isInstanceOf(CategoryChangeSlugAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategoryChangeSlugAction.builder()
+        return new Object[][] { new Object[] { "slug", CategoryChangeSlugAction.builder()
                 .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryDraftTest.java
index 781b85f170a..6cb38e46f4a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryDraftTest.java
@@ -3,51 +3,50 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryDraftBuilder builder) {
         CategoryDraft categoryDraft = builder.buildUnchecked();
         Assertions.assertThat(categoryDraft).isInstanceOf(CategoryDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "name",
                         CategoryDraft.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+                new Object[] { "slug",
                         CategoryDraft.builder().slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CategoryDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CategoryDraft.builder()
-                        .parent(new com.commercetools.api.models.category.CategoryResourceIdentifierImpl()) },
-                new Object[] { CategoryDraft.builder().orderHint("orderHint") },
-                new Object[] { CategoryDraft.builder().externalId("externalId") },
-                new Object[] { CategoryDraft.builder()
-                        .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CategoryDraft.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CategoryDraft.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+                new Object[] { "description",
+                        CategoryDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "parent",
+                        CategoryDraft.builder()
+                                .parent(new com.commercetools.api.models.category.CategoryResourceIdentifierImpl()) },
+                new Object[] { "orderHint", CategoryDraft.builder().orderHint("orderHint") },
+                new Object[] { "externalId", CategoryDraft.builder().externalId("externalId") },
+                new Object[] { "metaTitle",
+                        CategoryDraft.builder()
+                                .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        CategoryDraft.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        CategoryDraft.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "custom",
                         CategoryDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { CategoryDraft.builder()
-                        .assets(Collections.singletonList(new com.commercetools.api.models.common.AssetDraftImpl())) },
-                new Object[] { CategoryDraft.builder().key("key") } };
+                new Object[] { "assets",
+                        CategoryDraft.builder()
+                                .assets(Collections
+                                        .singletonList(new com.commercetools.api.models.common.AssetDraftImpl())) },
+                new Object[] { "key", CategoryDraft.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryPagedQueryResponseTest.java
index 945bfe9e238..54bafb99a00 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryPagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryPagedQueryResponseBuilder builder) {
         CategoryPagedQueryResponse categoryPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(categoryPagedQueryResponse).isInstanceOf(CategoryPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategoryPagedQueryResponse.builder().limit(7L) },
-                new Object[] { CategoryPagedQueryResponse.builder().offset(3L) },
-                new Object[] { CategoryPagedQueryResponse.builder().count(2L) },
-                new Object[] { CategoryPagedQueryResponse.builder().total(1L) },
-                new Object[] { CategoryPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", CategoryPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", CategoryPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", CategoryPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", CategoryPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", CategoryPagedQueryResponse.builder()
                         .results(
                             Collections.singletonList(new com.commercetools.api.models.category.CategoryImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryReferenceTest.java
index 86e954507d3..2adb27e9071 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryReferenceTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryReferenceBuilder builder) {
         CategoryReference categoryReference = builder.buildUnchecked();
         Assertions.assertThat(categoryReference).isInstanceOf(CategoryReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "obj",
                         CategoryReference.builder().obj(new com.commercetools.api.models.category.CategoryImpl()) },
-                new Object[] { CategoryReference.builder().id("id") } };
+                new Object[] { "id", CategoryReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryRemoveAssetActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryRemoveAssetActionTest.java
index 3a0a17d9ebc..3160512b373 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryRemoveAssetActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryRemoveAssetActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryRemoveAssetActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryRemoveAssetActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryRemoveAssetActionBuilder builder) {
         CategoryRemoveAssetAction categoryRemoveAssetAction = builder.buildUnchecked();
         Assertions.assertThat(categoryRemoveAssetAction).isInstanceOf(CategoryRemoveAssetAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategoryRemoveAssetAction.builder().assetId("assetId") },
-                new Object[] { CategoryRemoveAssetAction.builder().assetKey("assetKey") } };
+        return new Object[][] { new Object[] { "assetId", CategoryRemoveAssetAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", CategoryRemoveAssetAction.builder().assetKey("assetKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryResourceIdentifierTest.java
index cda336d7d80..568fb766398 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryResourceIdentifierBuilder builder) {
         CategoryResourceIdentifier categoryResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(categoryResourceIdentifier).isInstanceOf(CategoryResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategoryResourceIdentifier.builder().id("id") },
-                new Object[] { CategoryResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", CategoryResourceIdentifier.builder().id("id") },
+                new Object[] { "key", CategoryResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetCustomFieldActionTest.java
index ba862df74f9..9593c0666a3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetCustomFieldActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetAssetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetAssetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetAssetCustomFieldActionBuilder builder) {
         CategorySetAssetCustomFieldAction categorySetAssetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetAssetCustomFieldAction).isInstanceOf(CategorySetAssetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetAssetCustomFieldAction.builder().assetId("assetId") },
-                new Object[] { CategorySetAssetCustomFieldAction.builder().assetKey("assetKey") },
-                new Object[] { CategorySetAssetCustomFieldAction.builder().name("name") },
-                new Object[] { CategorySetAssetCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "assetId", CategorySetAssetCustomFieldAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", CategorySetAssetCustomFieldAction.builder().assetKey("assetKey") },
+                new Object[] { "name", CategorySetAssetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CategorySetAssetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetCustomTypeActionTest.java
index 1fa26c4547c..30508eb9535 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetCustomTypeActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetAssetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetAssetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetAssetCustomTypeActionBuilder builder) {
         CategorySetAssetCustomTypeAction categorySetAssetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetAssetCustomTypeAction).isInstanceOf(CategorySetAssetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetAssetCustomTypeAction.builder().assetId("assetId") },
-                new Object[] { CategorySetAssetCustomTypeAction.builder().assetKey("assetKey") },
-                new Object[] { CategorySetAssetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CategorySetAssetCustomTypeAction.builder()
+        return new Object[][] {
+                new Object[] { "assetId", CategorySetAssetCustomTypeAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", CategorySetAssetCustomTypeAction.builder().assetKey("assetKey") },
+                new Object[] { "type",
+                        CategorySetAssetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CategorySetAssetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetDescriptionActionTest.java
index 5e3a61f3c05..770c654936f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetDescriptionActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetAssetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetAssetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetAssetDescriptionActionBuilder builder) {
         CategorySetAssetDescriptionAction categorySetAssetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetAssetDescriptionAction).isInstanceOf(CategorySetAssetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetAssetDescriptionAction.builder().assetId("assetId") },
-                new Object[] { CategorySetAssetDescriptionAction.builder().assetKey("assetKey") },
-                new Object[] { CategorySetAssetDescriptionAction.builder()
+        return new Object[][] {
+                new Object[] { "assetId", CategorySetAssetDescriptionAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", CategorySetAssetDescriptionAction.builder().assetKey("assetKey") },
+                new Object[] { "description", CategorySetAssetDescriptionAction.builder()
                         .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetKeyActionTest.java
index 83e6cbfd2ac..bc15cac7cdc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetKeyActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetAssetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetAssetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetAssetKeyActionBuilder builder) {
         CategorySetAssetKeyAction categorySetAssetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetAssetKeyAction).isInstanceOf(CategorySetAssetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetAssetKeyAction.builder().assetId("assetId") },
-                new Object[] { CategorySetAssetKeyAction.builder().assetKey("assetKey") } };
+        return new Object[][] { new Object[] { "assetId", CategorySetAssetKeyAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", CategorySetAssetKeyAction.builder().assetKey("assetKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetSourcesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetSourcesActionTest.java
index 4436079c19a..2214a8d3643 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetSourcesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetSourcesActionTest.java
@@ -3,32 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetAssetSourcesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetAssetSourcesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetAssetSourcesActionBuilder builder) {
         CategorySetAssetSourcesAction categorySetAssetSourcesAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetAssetSourcesAction).isInstanceOf(CategorySetAssetSourcesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetAssetSourcesAction.builder().assetId("assetId") },
-                new Object[] { CategorySetAssetSourcesAction.builder().assetKey("assetKey") },
-                new Object[] { CategorySetAssetSourcesAction.builder()
+        return new Object[][] { new Object[] { "assetId", CategorySetAssetSourcesAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", CategorySetAssetSourcesAction.builder().assetKey("assetKey") },
+                new Object[] { "sources", CategorySetAssetSourcesAction.builder()
                         .sources(
                             Collections.singletonList(new com.commercetools.api.models.common.AssetSourceImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetTagsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetTagsActionTest.java
index 823cb9522b9..6187485acd0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetTagsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetAssetTagsActionTest.java
@@ -3,32 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetAssetTagsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetAssetTagsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetAssetTagsActionBuilder builder) {
         CategorySetAssetTagsAction categorySetAssetTagsAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetAssetTagsAction).isInstanceOf(CategorySetAssetTagsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetAssetTagsAction.builder().assetId("assetId") },
-                new Object[] { CategorySetAssetTagsAction.builder().assetKey("assetKey") },
-                new Object[] { CategorySetAssetTagsAction.builder().tags(Collections.singletonList("tags")) } };
+        return new Object[][] { new Object[] { "assetId", CategorySetAssetTagsAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", CategorySetAssetTagsAction.builder().assetKey("assetKey") },
+                new Object[] { "tags", CategorySetAssetTagsAction.builder().tags(Collections.singletonList("tags")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetCustomFieldActionTest.java
index 8a905396aa4..5ef7c9fedb6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetCustomFieldActionBuilder builder) {
         CategorySetCustomFieldAction categorySetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetCustomFieldAction).isInstanceOf(CategorySetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetCustomFieldAction.builder().name("name") },
-                new Object[] { CategorySetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", CategorySetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CategorySetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetCustomTypeActionTest.java
index a362e71ee9a..6221ce32df1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetCustomTypeActionBuilder builder) {
         CategorySetCustomTypeAction categorySetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetCustomTypeAction).isInstanceOf(CategorySetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CategorySetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CategorySetCustomTypeAction.builder()
+                new Object[] { "type",
+                        CategorySetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CategorySetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetDescriptionActionTest.java
index c39ec406904..cc7d24b6d51 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetDescriptionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetDescriptionActionBuilder builder) {
         CategorySetDescriptionAction categorySetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetDescriptionAction).isInstanceOf(CategorySetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetDescriptionAction.builder()
+        return new Object[][] { new Object[] { "description", CategorySetDescriptionAction.builder()
                 .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetExternalIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetExternalIdActionTest.java
index 360cf1e63cb..6c6cb8c05af 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetExternalIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetExternalIdActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetExternalIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetExternalIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetExternalIdActionBuilder builder) {
         CategorySetExternalIdAction categorySetExternalIdAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetExternalIdAction).isInstanceOf(CategorySetExternalIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetExternalIdAction.builder().externalId("externalId") } };
+        return new Object[][] {
+                new Object[] { "externalId", CategorySetExternalIdAction.builder().externalId("externalId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetKeyActionTest.java
index b12e4073264..aaf2ffd3e8c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetKeyActionBuilder builder) {
         CategorySetKeyAction categorySetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetKeyAction).isInstanceOf(CategorySetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", CategorySetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetMetaDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetMetaDescriptionActionTest.java
index 193fd2fe2c3..eead88d931f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetMetaDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetMetaDescriptionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetMetaDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetMetaDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetMetaDescriptionActionBuilder builder) {
         CategorySetMetaDescriptionAction categorySetMetaDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetMetaDescriptionAction).isInstanceOf(CategorySetMetaDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetMetaDescriptionAction.builder()
+        return new Object[][] { new Object[] { "metaDescription", CategorySetMetaDescriptionAction.builder()
                 .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetMetaKeywordsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetMetaKeywordsActionTest.java
index 9d9433a134c..23fe5bc0f43 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetMetaKeywordsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetMetaKeywordsActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetMetaKeywordsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetMetaKeywordsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetMetaKeywordsActionBuilder builder) {
         CategorySetMetaKeywordsAction categorySetMetaKeywordsAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetMetaKeywordsAction).isInstanceOf(CategorySetMetaKeywordsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetMetaKeywordsAction.builder()
+        return new Object[][] { new Object[] { "metaKeywords", CategorySetMetaKeywordsAction.builder()
                 .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetMetaTitleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetMetaTitleActionTest.java
index 487e269f2b9..5478a6d16d4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetMetaTitleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategorySetMetaTitleActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySetMetaTitleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySetMetaTitleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySetMetaTitleActionBuilder builder) {
         CategorySetMetaTitleAction categorySetMetaTitleAction = builder.buildUnchecked();
         Assertions.assertThat(categorySetMetaTitleAction).isInstanceOf(CategorySetMetaTitleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategorySetMetaTitleAction.builder()
+        return new Object[][] { new Object[] { "metaTitle", CategorySetMetaTitleAction.builder()
                 .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryTest.java
index 6d1df305701..dc347d2febe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryTest.java
@@ -4,57 +4,58 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryBuilder builder) {
         Category category = builder.buildUnchecked();
         Assertions.assertThat(category).isInstanceOf(Category.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Category.builder().id("id") },
-                new Object[] { Category.builder().version(2L) },
-                new Object[] { Category.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Category.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Category.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Category.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { Category.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { Category.builder().slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Category.builder().id("id") },
+                new Object[] { "version", Category.builder().version(2L) },
+                new Object[] { "createdAt", Category.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Category.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        Category.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
+                        Category.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
+                new Object[] { "name",
+                        Category.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "slug",
+                        Category.builder().slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
                         Category.builder().description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { Category.builder()
-                        .ancestors(Collections
-                                .singletonList(new com.commercetools.api.models.category.CategoryReferenceImpl())) },
-                new Object[] {
+                new Object[] { "ancestors",
+                        Category.builder()
+                                .ancestors(Collections.singletonList(
+                                    new com.commercetools.api.models.category.CategoryReferenceImpl())) },
+                new Object[] { "parent",
                         Category.builder().parent(new com.commercetools.api.models.category.CategoryReferenceImpl()) },
-                new Object[] { Category.builder().orderHint("orderHint") },
-                new Object[] { Category.builder().externalId("externalId") },
-                new Object[] {
+                new Object[] { "orderHint", Category.builder().orderHint("orderHint") },
+                new Object[] { "externalId", Category.builder().externalId("externalId") },
+                new Object[] { "metaTitle",
                         Category.builder().metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { Category.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { Category.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { Category.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { Category.builder()
+                new Object[] { "metaDescription",
+                        Category.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        Category.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "custom",
+                        Category.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "assets", Category.builder()
                         .assets(Collections.singletonList(new com.commercetools.api.models.common.AssetImpl())) },
-                new Object[] { Category.builder().key("key") } };
+                new Object[] { "key", Category.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryUpdateTest.java
index 6aef5707dc5..fa17dd5db6b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/category/CategoryUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryUpdateBuilder builder) {
         CategoryUpdate categoryUpdate = builder.buildUnchecked();
         Assertions.assertThat(categoryUpdate).isInstanceOf(CategoryUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategoryUpdate.builder().version(2L) },
-                new Object[] { CategoryUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.category.CategoryUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", CategoryUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        CategoryUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.category.CategoryUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelAddRolesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelAddRolesActionTest.java
index 893509993e7..bbe203502c1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelAddRolesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelAddRolesActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelAddRolesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelAddRolesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelAddRolesActionBuilder builder) {
         ChannelAddRolesAction channelAddRolesAction = builder.buildUnchecked();
         Assertions.assertThat(channelAddRolesAction).isInstanceOf(ChannelAddRolesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelAddRolesAction.builder()
-                .roles(Collections.singletonList(
-                    com.commercetools.api.models.channel.ChannelRoleEnum.findEnum("InventorySupply"))) } };
+        return new Object[][] { new Object[] { "roles",
+                ChannelAddRolesAction.builder()
+                        .roles(Collections.singletonList(
+                            com.commercetools.api.models.channel.ChannelRoleEnum.findEnum("InventorySupply"))) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelChangeDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelChangeDescriptionActionTest.java
index 03e8d79f8e0..e5013bf61c5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelChangeDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelChangeDescriptionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.channel;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelChangeDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelChangeDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelChangeDescriptionActionBuilder builder) {
         ChannelChangeDescriptionAction channelChangeDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(channelChangeDescriptionAction).isInstanceOf(ChannelChangeDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelChangeDescriptionAction.builder()
+        return new Object[][] { new Object[] { "description", ChannelChangeDescriptionAction.builder()
                 .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelChangeKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelChangeKeyActionTest.java
index 4eb47ef57c7..1610c00610b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelChangeKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelChangeKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.channel;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelChangeKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelChangeKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelChangeKeyActionBuilder builder) {
         ChannelChangeKeyAction channelChangeKeyAction = builder.buildUnchecked();
         Assertions.assertThat(channelChangeKeyAction).isInstanceOf(ChannelChangeKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelChangeKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ChannelChangeKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelChangeNameActionTest.java
index 10c960d9bbb..cdafe2c2f6f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.channel;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelChangeNameActionBuilder builder) {
         ChannelChangeNameAction channelChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(channelChangeNameAction).isInstanceOf(ChannelChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelChangeNameAction.builder()
+        return new Object[][] { new Object[] { "name", ChannelChangeNameAction.builder()
                 .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelDraftTest.java
index dfc469c86f6..e59a398077e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelDraftTest.java
@@ -3,42 +3,35 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelDraftBuilder builder) {
         ChannelDraft channelDraft = builder.buildUnchecked();
         Assertions.assertThat(channelDraft).isInstanceOf(ChannelDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelDraft.builder().key("key") },
-                new Object[] { ChannelDraft.builder()
+        return new Object[][] { new Object[] { "key", ChannelDraft.builder().key("key") },
+                new Object[] { "roles", ChannelDraft.builder()
                         .roles(Collections.singletonList(
                             com.commercetools.api.models.channel.ChannelRoleEnum.findEnum("InventorySupply"))) },
-                new Object[] {
+                new Object[] { "name",
                         ChannelDraft.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ChannelDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+                new Object[] { "description",
+                        ChannelDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "address",
                         ChannelDraft.builder().address(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] {
+                new Object[] { "custom",
                         ChannelDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] {
+                new Object[] { "geoLocation",
                         ChannelDraft.builder().geoLocation(new com.commercetools.api.models.common.GeoJsonImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelPagedQueryResponseTest.java
index 8da308ee2ae..008b253fdb9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelPagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelPagedQueryResponseBuilder builder) {
         ChannelPagedQueryResponse channelPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(channelPagedQueryResponse).isInstanceOf(ChannelPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ChannelPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ChannelPagedQueryResponse.builder().count(2L) },
-                new Object[] { ChannelPagedQueryResponse.builder().total(1L) },
-                new Object[] { ChannelPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", ChannelPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ChannelPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ChannelPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ChannelPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", ChannelPagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.channel.ChannelImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelReferenceTest.java
index 87228d09722..ea44aa2edbb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelReferenceTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.channel;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelReferenceBuilder builder) {
         ChannelReference channelReference = builder.buildUnchecked();
         Assertions.assertThat(channelReference).isInstanceOf(ChannelReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ChannelReference.builder().obj(new com.commercetools.api.models.channel.ChannelImpl()) },
-                new Object[] { ChannelReference.builder().id("id") } };
+                new Object[] { "obj",
+                        ChannelReference.builder().obj(new com.commercetools.api.models.channel.ChannelImpl()) },
+                new Object[] { "id", ChannelReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelRemoveRolesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelRemoveRolesActionTest.java
index f66fcf569d9..82b2b560f24 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelRemoveRolesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelRemoveRolesActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelRemoveRolesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelRemoveRolesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelRemoveRolesActionBuilder builder) {
         ChannelRemoveRolesAction channelRemoveRolesAction = builder.buildUnchecked();
         Assertions.assertThat(channelRemoveRolesAction).isInstanceOf(ChannelRemoveRolesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelRemoveRolesAction.builder()
-                .roles(Collections.singletonList(
-                    com.commercetools.api.models.channel.ChannelRoleEnum.findEnum("InventorySupply"))) } };
+        return new Object[][] { new Object[] { "roles",
+                ChannelRemoveRolesAction.builder()
+                        .roles(Collections.singletonList(
+                            com.commercetools.api.models.channel.ChannelRoleEnum.findEnum("InventorySupply"))) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelResourceIdentifierTest.java
index bc494330d08..a1297cff4f4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.channel;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelResourceIdentifierBuilder builder) {
         ChannelResourceIdentifier channelResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(channelResourceIdentifier).isInstanceOf(ChannelResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelResourceIdentifier.builder().id("id") },
-                new Object[] { ChannelResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", ChannelResourceIdentifier.builder().id("id") },
+                new Object[] { "key", ChannelResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetAddressActionTest.java
index ef91a8e720d..6ed64230b82 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.channel;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelSetAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelSetAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelSetAddressActionBuilder builder) {
         ChannelSetAddressAction channelSetAddressAction = builder.buildUnchecked();
         Assertions.assertThat(channelSetAddressAction).isInstanceOf(ChannelSetAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelSetAddressAction.builder()
+        return new Object[][] { new Object[] { "address", ChannelSetAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetAddressCustomFieldActionTest.java
index 6c59514f002..6db6d40bfae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetAddressCustomFieldActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.channel;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelSetAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelSetAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelSetAddressCustomFieldActionBuilder builder) {
         ChannelSetAddressCustomFieldAction channelSetAddressCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(channelSetAddressCustomFieldAction)
                 .isInstanceOf(ChannelSetAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelSetAddressCustomFieldAction.builder().name("name") },
-                new Object[] { ChannelSetAddressCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", ChannelSetAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ChannelSetAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetAddressCustomTypeActionTest.java
index e6eb0240713..2fff28226c0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetAddressCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.channel;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelSetAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelSetAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelSetAddressCustomTypeActionBuilder builder) {
         ChannelSetAddressCustomTypeAction channelSetAddressCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(channelSetAddressCustomTypeAction).isInstanceOf(ChannelSetAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ChannelSetAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ChannelSetAddressCustomTypeAction.builder()
+                new Object[] { "type",
+                        ChannelSetAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ChannelSetAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetCustomFieldActionTest.java
index d3fcb2227e8..3a681d14201 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.channel;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelSetCustomFieldActionBuilder builder) {
         ChannelSetCustomFieldAction channelSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(channelSetCustomFieldAction).isInstanceOf(ChannelSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelSetCustomFieldAction.builder().name("name") },
-                new Object[] { ChannelSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", ChannelSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ChannelSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetCustomTypeActionTest.java
index 9b2baac587a..fa6c6688fcc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.channel;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelSetCustomTypeActionBuilder builder) {
         ChannelSetCustomTypeAction channelSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(channelSetCustomTypeAction).isInstanceOf(ChannelSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ChannelSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ChannelSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        ChannelSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ChannelSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetGeoLocationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetGeoLocationActionTest.java
index 966c542da0b..9d9823904e3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetGeoLocationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetGeoLocationActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.channel;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelSetGeoLocationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelSetGeoLocationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelSetGeoLocationActionBuilder builder) {
         ChannelSetGeoLocationAction channelSetGeoLocationAction = builder.buildUnchecked();
         Assertions.assertThat(channelSetGeoLocationAction).isInstanceOf(ChannelSetGeoLocationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelSetGeoLocationAction.builder()
+        return new Object[][] { new Object[] { "geoLocation", ChannelSetGeoLocationAction.builder()
                 .geoLocation(new com.commercetools.api.models.common.GeoJsonImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetRolesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetRolesActionTest.java
index 5df2e32667d..e6b2a9db15c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetRolesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelSetRolesActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelSetRolesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelSetRolesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelSetRolesActionBuilder builder) {
         ChannelSetRolesAction channelSetRolesAction = builder.buildUnchecked();
         Assertions.assertThat(channelSetRolesAction).isInstanceOf(ChannelSetRolesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelSetRolesAction.builder()
-                .roles(Collections.singletonList(
-                    com.commercetools.api.models.channel.ChannelRoleEnum.findEnum("InventorySupply"))) } };
+        return new Object[][] { new Object[] { "roles",
+                ChannelSetRolesAction.builder()
+                        .roles(Collections.singletonList(
+                            com.commercetools.api.models.channel.ChannelRoleEnum.findEnum("InventorySupply"))) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelTest.java
index c86df17de95..8a35d66b81f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelTest.java
@@ -4,48 +4,47 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelBuilder builder) {
         Channel channel = builder.buildUnchecked();
         Assertions.assertThat(channel).isInstanceOf(Channel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Channel.builder().id("id") },
-                new Object[] { Channel.builder().version(2L) },
-                new Object[] { Channel.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Channel.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Channel.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Channel.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { Channel.builder().key("key") },
-                new Object[] { Channel.builder()
+        return new Object[][] { new Object[] { "id", Channel.builder().id("id") },
+                new Object[] { "version", Channel.builder().version(2L) },
+                new Object[] { "createdAt", Channel.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Channel.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        Channel.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
+                        Channel.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
+                new Object[] { "key", Channel.builder().key("key") },
+                new Object[] { "roles", Channel.builder()
                         .roles(Collections.singletonList(
                             com.commercetools.api.models.channel.ChannelRoleEnum.findEnum("InventorySupply"))) },
-                new Object[] { Channel.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+                new Object[] { "name",
+                        Channel.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
                         Channel.builder().description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { Channel.builder().address(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { Channel.builder()
+                new Object[] { "address",
+                        Channel.builder().address(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "reviewRatingStatistics", Channel.builder()
                         .reviewRatingStatistics(new com.commercetools.api.models.review.ReviewRatingStatisticsImpl()) },
-                new Object[] { Channel.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { Channel.builder().geoLocation(new com.commercetools.api.models.common.GeoJsonImpl()) } };
+                new Object[] { "custom",
+                        Channel.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "geoLocation",
+                        Channel.builder().geoLocation(new com.commercetools.api.models.common.GeoJsonImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelUpdateTest.java
index 8992b4db189..c47ed56670b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/channel/ChannelUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChannelUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChannelUpdateBuilder builder) {
         ChannelUpdate channelUpdate = builder.buildUnchecked();
         Assertions.assertThat(channelUpdate).isInstanceOf(ChannelUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChannelUpdate.builder().version(2L) },
-                new Object[] { ChannelUpdate.builder()
-                        .actions(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", ChannelUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        ChannelUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AddressDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AddressDraftTest.java
index 5931e098829..6bc28c94e3a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AddressDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AddressDraftTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddressDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddressDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddressDraftBuilder builder) {
         AddressDraft addressDraft = builder.buildUnchecked();
         Assertions.assertThat(addressDraft).isInstanceOf(AddressDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "custom",
                 AddressDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AddressTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AddressTest.java
index e28ce044948..b4d85568533 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AddressTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AddressTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddressTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddressBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddressBuilder builder) {
         Address address = builder.buildUnchecked();
         Assertions.assertThat(address).isInstanceOf(Address.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { Address.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { Address.builder().id("id") } };
+                new Object[] { "custom",
+                        Address.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "id", Address.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetDimensionsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetDimensionsTest.java
index fcc9b5387fe..f0cbc190306 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetDimensionsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetDimensionsTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssetDimensionsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssetDimensionsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssetDimensionsBuilder builder) {
         AssetDimensions assetDimensions = builder.buildUnchecked();
         Assertions.assertThat(assetDimensions).isInstanceOf(AssetDimensions.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssetDimensions.builder().w(5) },
-                new Object[] { AssetDimensions.builder().h(6) } };
+        return new Object[][] { new Object[] { "w", AssetDimensions.builder().w(5) },
+                new Object[] { "h", AssetDimensions.builder().h(6) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetDraftTest.java
index 07c94a879fb..79e33f66f9b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetDraftTest.java
@@ -3,42 +3,35 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssetDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssetDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssetDraftBuilder builder) {
         AssetDraft assetDraft = builder.buildUnchecked();
         Assertions.assertThat(assetDraft).isInstanceOf(AssetDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "sources",
                         AssetDraft.builder()
                                 .sources(Collections
                                         .singletonList(new com.commercetools.api.models.common.AssetSourceImpl())) },
-                new Object[] {
+                new Object[] { "name",
                         AssetDraft.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { AssetDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { AssetDraft.builder().tags(Collections.singletonList("tags")) },
-                new Object[] {
+                new Object[] { "description",
+                        AssetDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "tags", AssetDraft.builder().tags(Collections.singletonList("tags")) },
+                new Object[] { "custom",
                         AssetDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { AssetDraft.builder().key("key") } };
+                new Object[] { "key", AssetDraft.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetSourceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetSourceTest.java
index 31f1c174936..6bbfeb7ddd1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetSourceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetSourceTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssetSourceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssetSourceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssetSourceBuilder builder) {
         AssetSource assetSource = builder.buildUnchecked();
         Assertions.assertThat(assetSource).isInstanceOf(AssetSource.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssetSource.builder().uri("uri") },
-                new Object[] { AssetSource.builder().key("key") },
-                new Object[] { AssetSource.builder()
-                        .dimensions(new com.commercetools.api.models.common.AssetDimensionsImpl()) },
-                new Object[] { AssetSource.builder().contentType("contentType") } };
+        return new Object[][] { new Object[] { "uri", AssetSource.builder().uri("uri") },
+                new Object[] { "key", AssetSource.builder().key("key") },
+                new Object[] { "dimensions",
+                        AssetSource.builder()
+                                .dimensions(new com.commercetools.api.models.common.AssetDimensionsImpl()) },
+                new Object[] { "contentType", AssetSource.builder().contentType("contentType") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetTest.java
index 8c5b9cd0732..8922dcc988c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AssetTest.java
@@ -3,37 +3,34 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssetTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssetBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssetBuilder builder) {
         Asset asset = builder.buildUnchecked();
         Assertions.assertThat(asset).isInstanceOf(Asset.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Asset.builder().id("id") }, new Object[] { Asset.builder()
-                .sources(Collections.singletonList(new com.commercetools.api.models.common.AssetSourceImpl())) },
-                new Object[] { Asset.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Asset.builder().id("id") },
+                new Object[] { "sources",
+                        Asset.builder()
+                                .sources(Collections
+                                        .singletonList(new com.commercetools.api.models.common.AssetSourceImpl())) },
+                new Object[] { "name",
+                        Asset.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
                         Asset.builder().description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { Asset.builder().tags(Collections.singletonList("tags")) },
-                new Object[] { Asset.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { Asset.builder().key("key") } };
+                new Object[] { "tags", Asset.builder().tags(Collections.singletonList("tags")) },
+                new Object[] { "custom",
+                        Asset.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "key", Asset.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AttributionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AttributionTest.java
index b30dc08b337..70740fe2014 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AttributionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/AttributionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributionBuilder builder) {
         Attribution attribution = builder.buildUnchecked();
         Assertions.assertThat(attribution).isInstanceOf(Attribution.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Attribution.builder().clientId("clientId") },
-                new Object[] { Attribution.builder()
+        return new Object[][] { new Object[] { "clientId", Attribution.builder().clientId("clientId") },
+                new Object[] { "source", Attribution.builder()
                         .source(com.commercetools.api.models.common.AttributionSource.findEnum("Import")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/BaseAddressTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/BaseAddressTest.java
index 34c22b38e57..940bd55325f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/BaseAddressTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/BaseAddressTest.java
@@ -1,54 +1,48 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BaseAddressTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BaseAddressBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BaseAddressBuilder builder) {
         BaseAddress baseAddress = builder.buildUnchecked();
         Assertions.assertThat(baseAddress).isInstanceOf(BaseAddress.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BaseAddress.builder().id("id") },
-                new Object[] { BaseAddress.builder().key("key") },
-                new Object[] { BaseAddress.builder().country("country") },
-                new Object[] { BaseAddress.builder().title("title") },
-                new Object[] { BaseAddress.builder().salutation("salutation") },
-                new Object[] { BaseAddress.builder().firstName("firstName") },
-                new Object[] { BaseAddress.builder().lastName("lastName") },
-                new Object[] { BaseAddress.builder().streetName("streetName") },
-                new Object[] { BaseAddress.builder().streetNumber("streetNumber") },
-                new Object[] { BaseAddress.builder().additionalStreetInfo("additionalStreetInfo") },
-                new Object[] { BaseAddress.builder().postalCode("postalCode") },
-                new Object[] { BaseAddress.builder().city("city") },
-                new Object[] { BaseAddress.builder().region("region") },
-                new Object[] { BaseAddress.builder().state("state") },
-                new Object[] { BaseAddress.builder().company("company") },
-                new Object[] { BaseAddress.builder().department("department") },
-                new Object[] { BaseAddress.builder().building("building") },
-                new Object[] { BaseAddress.builder().apartment("apartment") },
-                new Object[] { BaseAddress.builder().pOBox("pOBox") },
-                new Object[] { BaseAddress.builder().phone("phone") },
-                new Object[] { BaseAddress.builder().mobile("mobile") },
-                new Object[] { BaseAddress.builder().email("email") },
-                new Object[] { BaseAddress.builder().fax("fax") },
-                new Object[] { BaseAddress.builder().additionalAddressInfo("additionalAddressInfo") },
-                new Object[] { BaseAddress.builder().externalId("externalId") } };
+        return new Object[][] { new Object[] { "id", BaseAddress.builder().id("id") },
+                new Object[] { "key", BaseAddress.builder().key("key") },
+                new Object[] { "country", BaseAddress.builder().country("country") },
+                new Object[] { "title", BaseAddress.builder().title("title") },
+                new Object[] { "salutation", BaseAddress.builder().salutation("salutation") },
+                new Object[] { "firstName", BaseAddress.builder().firstName("firstName") },
+                new Object[] { "lastName", BaseAddress.builder().lastName("lastName") },
+                new Object[] { "streetName", BaseAddress.builder().streetName("streetName") },
+                new Object[] { "streetNumber", BaseAddress.builder().streetNumber("streetNumber") },
+                new Object[] { "additionalStreetInfo",
+                        BaseAddress.builder().additionalStreetInfo("additionalStreetInfo") },
+                new Object[] { "postalCode", BaseAddress.builder().postalCode("postalCode") },
+                new Object[] { "city", BaseAddress.builder().city("city") },
+                new Object[] { "region", BaseAddress.builder().region("region") },
+                new Object[] { "state", BaseAddress.builder().state("state") },
+                new Object[] { "company", BaseAddress.builder().company("company") },
+                new Object[] { "department", BaseAddress.builder().department("department") },
+                new Object[] { "building", BaseAddress.builder().building("building") },
+                new Object[] { "apartment", BaseAddress.builder().apartment("apartment") },
+                new Object[] { "pOBox", BaseAddress.builder().pOBox("pOBox") },
+                new Object[] { "phone", BaseAddress.builder().phone("phone") },
+                new Object[] { "mobile", BaseAddress.builder().mobile("mobile") },
+                new Object[] { "email", BaseAddress.builder().email("email") },
+                new Object[] { "fax", BaseAddress.builder().fax("fax") },
+                new Object[] { "additionalAddressInfo",
+                        BaseAddress.builder().additionalAddressInfo("additionalAddressInfo") },
+                new Object[] { "externalId", BaseAddress.builder().externalId("externalId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/CentPrecisionMoneyDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/CentPrecisionMoneyDraftTest.java
index ffab9b73102..3b7e1de013a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/CentPrecisionMoneyDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/CentPrecisionMoneyDraftTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CentPrecisionMoneyDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CentPrecisionMoneyDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CentPrecisionMoneyDraftBuilder builder) {
         CentPrecisionMoneyDraft centPrecisionMoneyDraft = builder.buildUnchecked();
         Assertions.assertThat(centPrecisionMoneyDraft).isInstanceOf(CentPrecisionMoneyDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CentPrecisionMoneyDraft.builder().fractionDigits(4) } };
+        return new Object[][] {
+                new Object[] { "fractionDigits", CentPrecisionMoneyDraft.builder().fractionDigits(4) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/CentPrecisionMoneyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/CentPrecisionMoneyTest.java
index d18bb571898..c086f774678 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/CentPrecisionMoneyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/CentPrecisionMoneyTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CentPrecisionMoneyTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CentPrecisionMoneyBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CentPrecisionMoneyBuilder builder) {
         CentPrecisionMoney centPrecisionMoney = builder.buildUnchecked();
         Assertions.assertThat(centPrecisionMoney).isInstanceOf(CentPrecisionMoney.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CentPrecisionMoney.builder().fractionDigits(4) } };
+        return new Object[][] { new Object[] { "fractionDigits", CentPrecisionMoney.builder().fractionDigits(4) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ClientLoggingTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ClientLoggingTest.java
index 7f5642345de..ee0ce2fdb2b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ClientLoggingTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ClientLoggingTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ClientLoggingTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ClientLoggingBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ClientLoggingBuilder builder) {
         ClientLogging clientLogging = builder.buildUnchecked();
         Assertions.assertThat(clientLogging).isInstanceOf(ClientLogging.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ClientLogging.builder().clientId("clientId") },
-                new Object[] { ClientLogging.builder().externalUserId("externalUserId") },
-                new Object[] { ClientLogging.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { ClientLogging.builder().anonymousId("anonymousId") },
-                new Object[] { ClientLogging.builder()
+        return new Object[][] { new Object[] { "clientId", ClientLogging.builder().clientId("clientId") },
+                new Object[] { "externalUserId", ClientLogging.builder().externalUserId("externalUserId") },
+                new Object[] { "customer",
+                        ClientLogging.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "anonymousId", ClientLogging.builder().anonymousId("anonymousId") },
+                new Object[] { "associate", ClientLogging.builder()
                         .associate(new com.commercetools.api.models.customer.CustomerReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/CreatedByTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/CreatedByTest.java
index 49883b91c27..223ebf2af75 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/CreatedByTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/CreatedByTest.java
@@ -1,37 +1,30 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CreatedByTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CreatedByBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CreatedByBuilder builder) {
         CreatedBy createdBy = builder.buildUnchecked();
         Assertions.assertThat(createdBy).isInstanceOf(CreatedBy.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CreatedBy.builder().clientId("clientId") },
-                new Object[] { CreatedBy.builder().externalUserId("externalUserId") },
-                new Object[] { CreatedBy.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { CreatedBy.builder().anonymousId("anonymousId") },
-                new Object[] {
+        return new Object[][] { new Object[] { "clientId", CreatedBy.builder().clientId("clientId") },
+                new Object[] { "externalUserId", CreatedBy.builder().externalUserId("externalUserId") },
+                new Object[] { "customer",
+                        CreatedBy.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "anonymousId", CreatedBy.builder().anonymousId("anonymousId") },
+                new Object[] { "attributedTo",
                         CreatedBy.builder().attributedTo(new com.commercetools.api.models.common.AttributionImpl()) },
-                new Object[] { CreatedBy.builder()
+                new Object[] { "associate", CreatedBy.builder()
                         .associate(new com.commercetools.api.models.customer.CustomerReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/DiscountedPriceDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/DiscountedPriceDraftTest.java
index 33e4cfaee3e..a040e713482 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/DiscountedPriceDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/DiscountedPriceDraftTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedPriceDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedPriceDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedPriceDraftBuilder builder) {
         DiscountedPriceDraft discountedPriceDraft = builder.buildUnchecked();
         Assertions.assertThat(discountedPriceDraft).isInstanceOf(DiscountedPriceDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "value",
                         DiscountedPriceDraft.builder().value(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { DiscountedPriceDraft.builder()
+                new Object[] { "discount", DiscountedPriceDraft.builder()
                         .discount(new com.commercetools.api.models.product_discount.ProductDiscountReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/DiscountedPriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/DiscountedPriceTest.java
index 7bc22a88cec..2a8bd4d82ae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/DiscountedPriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/DiscountedPriceTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedPriceBuilder builder) {
         DiscountedPrice discountedPrice = builder.buildUnchecked();
         Assertions.assertThat(discountedPrice).isInstanceOf(DiscountedPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "value",
                         DiscountedPrice.builder().value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] { DiscountedPrice.builder()
+                new Object[] { "discount", DiscountedPrice.builder()
                         .discount(new com.commercetools.api.models.product_discount.ProductDiscountReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/GeoJsonPointTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/GeoJsonPointTest.java
index 78f9e1b9863..4f73765f972 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/GeoJsonPointTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/GeoJsonPointTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GeoJsonPointTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GeoJsonPointBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GeoJsonPointBuilder builder) {
         GeoJsonPoint geoJsonPoint = builder.buildUnchecked();
         Assertions.assertThat(geoJsonPoint).isInstanceOf(GeoJsonPoint.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { GeoJsonPoint.builder().coordinates(Collections.singletonList(0.34595948)) } };
+        return new Object[][] { new Object[] { "coordinates",
+                GeoJsonPoint.builder().coordinates(Collections.singletonList(0.34595948)) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/HighPrecisionMoneyDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/HighPrecisionMoneyDraftTest.java
index b28a146b401..1d7c005a469 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/HighPrecisionMoneyDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/HighPrecisionMoneyDraftTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class HighPrecisionMoneyDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(HighPrecisionMoneyDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, HighPrecisionMoneyDraftBuilder builder) {
         HighPrecisionMoneyDraft highPrecisionMoneyDraft = builder.buildUnchecked();
         Assertions.assertThat(highPrecisionMoneyDraft).isInstanceOf(HighPrecisionMoneyDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { HighPrecisionMoneyDraft.builder().fractionDigits(4) },
-                new Object[] { HighPrecisionMoneyDraft.builder().preciseAmount(3L) },
-                new Object[] { HighPrecisionMoneyDraft.builder().centAmount(3L) } };
+        return new Object[][] { new Object[] { "fractionDigits", HighPrecisionMoneyDraft.builder().fractionDigits(4) },
+                new Object[] { "preciseAmount", HighPrecisionMoneyDraft.builder().preciseAmount(3L) },
+                new Object[] { "centAmount", HighPrecisionMoneyDraft.builder().centAmount(3L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/HighPrecisionMoneyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/HighPrecisionMoneyTest.java
index 1ddc780911d..951774b8660 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/HighPrecisionMoneyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/HighPrecisionMoneyTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class HighPrecisionMoneyTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(HighPrecisionMoneyBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, HighPrecisionMoneyBuilder builder) {
         HighPrecisionMoney highPrecisionMoney = builder.buildUnchecked();
         Assertions.assertThat(highPrecisionMoney).isInstanceOf(HighPrecisionMoney.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { HighPrecisionMoney.builder().preciseAmount(3L) },
-                new Object[] { HighPrecisionMoney.builder().fractionDigits(4) } };
+        return new Object[][] { new Object[] { "preciseAmount", HighPrecisionMoney.builder().preciseAmount(3L) },
+                new Object[] { "fractionDigits", HighPrecisionMoney.builder().fractionDigits(4) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ImageDimensionsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ImageDimensionsTest.java
index f0f0e89e5ee..a3ad6cf7282 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ImageDimensionsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ImageDimensionsTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImageDimensionsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImageDimensionsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImageDimensionsBuilder builder) {
         ImageDimensions imageDimensions = builder.buildUnchecked();
         Assertions.assertThat(imageDimensions).isInstanceOf(ImageDimensions.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImageDimensions.builder().w(5) },
-                new Object[] { ImageDimensions.builder().h(6) } };
+        return new Object[][] { new Object[] { "w", ImageDimensions.builder().w(5) },
+                new Object[] { "h", ImageDimensions.builder().h(6) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ImageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ImageTest.java
index 67cb0f9fb7e..2c26bcc8bfc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ImageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ImageTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImageBuilder builder) {
         Image image = builder.buildUnchecked();
         Assertions.assertThat(image).isInstanceOf(Image.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Image.builder().url("url") },
-                new Object[] {
+        return new Object[][] { new Object[] { "url", Image.builder().url("url") },
+                new Object[] { "dimensions",
                         Image.builder().dimensions(new com.commercetools.api.models.common.ImageDimensionsImpl()) },
-                new Object[] { Image.builder().label("label") } };
+                new Object[] { "label", Image.builder().label("label") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/LastModifiedByTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/LastModifiedByTest.java
index 32b6a5f9be4..12264f89cfa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/LastModifiedByTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/LastModifiedByTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LastModifiedByTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LastModifiedByBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LastModifiedByBuilder builder) {
         LastModifiedBy lastModifiedBy = builder.buildUnchecked();
         Assertions.assertThat(lastModifiedBy).isInstanceOf(LastModifiedBy.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LastModifiedBy.builder().clientId("clientId") },
-                new Object[] { LastModifiedBy.builder().externalUserId("externalUserId") },
-                new Object[] { LastModifiedBy.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { LastModifiedBy.builder().anonymousId("anonymousId") },
-                new Object[] { LastModifiedBy.builder()
-                        .attributedTo(new com.commercetools.api.models.common.AttributionImpl()) },
-                new Object[] { LastModifiedBy.builder()
+        return new Object[][] { new Object[] { "clientId", LastModifiedBy.builder().clientId("clientId") },
+                new Object[] { "externalUserId", LastModifiedBy.builder().externalUserId("externalUserId") },
+                new Object[] { "customer",
+                        LastModifiedBy.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "anonymousId", LastModifiedBy.builder().anonymousId("anonymousId") },
+                new Object[] { "attributedTo",
+                        LastModifiedBy.builder()
+                                .attributedTo(new com.commercetools.api.models.common.AttributionImpl()) },
+                new Object[] { "associate", LastModifiedBy.builder()
                         .associate(new com.commercetools.api.models.customer.CustomerReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PagedQueryResponseTest.java
index f86b422e135..4907fc60d0f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PagedQueryResponseTest.java
@@ -3,38 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PagedQueryResponseBuilder builder) {
         PagedQueryResponse pagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(pagedQueryResponse).isInstanceOf(PagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PagedQueryResponse.builder().limit(7L) },
-                new Object[] { PagedQueryResponse.builder().offset(3L) },
-                new Object[] { PagedQueryResponse.builder().count(2L) },
-                new Object[] { PagedQueryResponse.builder().total(1L) },
-                new Object[] {
+        return new Object[][] { new Object[] { "limit", PagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", PagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", PagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", PagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
                         PagedQueryResponse.builder()
                                 .results(Collections
                                         .singletonList(new com.commercetools.api.models.common.BaseResourceImpl())) },
-                new Object[] { PagedQueryResponse.builder().meta("meta") } };
+                new Object[] { "meta", PagedQueryResponse.builder().meta("meta") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceDraftTest.java
index af805f38ec6..2c9c28c481c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceDraftTest.java
@@ -4,46 +4,42 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PriceDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PriceDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PriceDraftBuilder builder) {
         PriceDraft priceDraft = builder.buildUnchecked();
         Assertions.assertThat(priceDraft).isInstanceOf(PriceDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PriceDraft.builder().key("key") },
-                new Object[] { PriceDraft.builder().value(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { PriceDraft.builder().country("country") },
-                new Object[] { PriceDraft.builder()
+        return new Object[][] { new Object[] { "key", PriceDraft.builder().key("key") },
+                new Object[] { "value",
+                        PriceDraft.builder().value(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "country", PriceDraft.builder().country("country") },
+                new Object[] { "customerGroup", PriceDraft.builder()
                         .customerGroup(
                             new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) },
-                new Object[] { PriceDraft.builder()
-                        .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { PriceDraft.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { PriceDraft.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { PriceDraft.builder()
-                        .discounted(new com.commercetools.api.models.common.DiscountedPriceDraftImpl()) },
-                new Object[] {
+                new Object[] { "channel",
+                        PriceDraft.builder()
+                                .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "validFrom", PriceDraft.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        PriceDraft.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "discounted",
+                        PriceDraft.builder()
+                                .discounted(new com.commercetools.api.models.common.DiscountedPriceDraftImpl()) },
+                new Object[] { "tiers",
                         PriceDraft.builder()
                                 .tiers(Collections
                                         .singletonList(new com.commercetools.api.models.common.PriceTierDraftImpl())) },
-                new Object[] {
+                new Object[] { "custom",
                         PriceDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceTest.java
index 34a7968e5bb..0e58236f098 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceTest.java
@@ -4,43 +4,40 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PriceBuilder builder) {
         Price price = builder.buildUnchecked();
         Assertions.assertThat(price).isInstanceOf(Price.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Price.builder().id("id") }, new Object[] { Price.builder().key("key") },
-                new Object[] { Price.builder().value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] { Price.builder().country("country") },
-                new Object[] { Price.builder()
+        return new Object[][] { new Object[] { "id", Price.builder().id("id") },
+                new Object[] { "key", Price.builder().key("key") },
+                new Object[] { "value",
+                        Price.builder().value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
+                new Object[] { "country", Price.builder().country("country") },
+                new Object[] { "customerGroup", Price.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] {
+                new Object[] { "channel",
                         Price.builder().channel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
-                new Object[] { Price.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Price.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+                new Object[] { "validFrom", Price.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil", Price.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "discounted",
                         Price.builder().discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) },
-                new Object[] { Price.builder()
-                        .tiers(Collections.singletonList(new com.commercetools.api.models.common.PriceTierImpl())) },
-                new Object[] { Price.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
+                new Object[] { "tiers",
+                        Price.builder()
+                                .tiers(Collections
+                                        .singletonList(new com.commercetools.api.models.common.PriceTierImpl())) },
+                new Object[] { "custom",
+                        Price.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceTierDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceTierDraftTest.java
index a53a74f6b5e..fa4d89f83e1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceTierDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceTierDraftTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PriceTierDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PriceTierDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PriceTierDraftBuilder builder) {
         PriceTierDraft priceTierDraft = builder.buildUnchecked();
         Assertions.assertThat(priceTierDraft).isInstanceOf(PriceTierDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PriceTierDraft.builder().minimumQuantity(1L) },
-                new Object[] { PriceTierDraft.builder().value(new com.commercetools.api.models.common.MoneyImpl()) } };
+        return new Object[][] { new Object[] { "minimumQuantity", PriceTierDraft.builder().minimumQuantity(1L) },
+                new Object[] { "value",
+                        PriceTierDraft.builder().value(new com.commercetools.api.models.common.MoneyImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceTierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceTierTest.java
index 6c22a25bbc2..465e4737a83 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceTierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/PriceTierTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PriceTierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PriceTierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PriceTierBuilder builder) {
         PriceTier priceTier = builder.buildUnchecked();
         Assertions.assertThat(priceTier).isInstanceOf(PriceTier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PriceTier.builder().minimumQuantity(1L) },
-                new Object[] { PriceTier.builder().value(new com.commercetools.api.models.common.TypedMoneyImpl()) } };
+        return new Object[][] { new Object[] { "minimumQuantity", PriceTier.builder().minimumQuantity(1L) },
+                new Object[] { "value",
+                        PriceTier.builder().value(new com.commercetools.api.models.common.TypedMoneyImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/QueryPriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/QueryPriceTest.java
index 3e2f343b783..29b0c964958 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/QueryPriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/QueryPriceTest.java
@@ -4,44 +4,41 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QueryPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QueryPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QueryPriceBuilder builder) {
         QueryPrice queryPrice = builder.buildUnchecked();
         Assertions.assertThat(queryPrice).isInstanceOf(QueryPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QueryPrice.builder().id("id") },
-                new Object[] { QueryPrice.builder().value(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { QueryPrice.builder().country("country") },
-                new Object[] { QueryPrice.builder()
+        return new Object[][] { new Object[] { "id", QueryPrice.builder().id("id") },
+                new Object[] { "value",
+                        QueryPrice.builder().value(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "country", QueryPrice.builder().country("country") },
+                new Object[] { "customerGroup", QueryPrice.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] {
+                new Object[] { "channel",
                         QueryPrice.builder().channel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
-                new Object[] { QueryPrice.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { QueryPrice.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { QueryPrice.builder()
-                        .discounted(new com.commercetools.api.models.common.DiscountedPriceDraftImpl()) },
-                new Object[] { QueryPrice.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { QueryPrice.builder()
-                        .tiers(Collections
-                                .singletonList(new com.commercetools.api.models.common.PriceTierDraftImpl())) } };
+                new Object[] { "validFrom", QueryPrice.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        QueryPrice.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "discounted",
+                        QueryPrice.builder()
+                                .discounted(new com.commercetools.api.models.common.DiscountedPriceDraftImpl()) },
+                new Object[] { "custom",
+                        QueryPrice.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "tiers",
+                        QueryPrice.builder()
+                                .tiers(Collections.singletonList(
+                                    new com.commercetools.api.models.common.PriceTierDraftImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ScopedPriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ScopedPriceTest.java
index 68b8fc012c5..8ea7d433fc0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ScopedPriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/ScopedPriceTest.java
@@ -3,43 +3,39 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ScopedPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ScopedPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ScopedPriceBuilder builder) {
         ScopedPrice scopedPrice = builder.buildUnchecked();
         Assertions.assertThat(scopedPrice).isInstanceOf(ScopedPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ScopedPrice.builder().id("id") },
-                new Object[] { ScopedPrice.builder().value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", ScopedPrice.builder().id("id") },
+                new Object[] { "value",
+                        ScopedPrice.builder().value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
+                new Object[] { "currentValue",
                         ScopedPrice.builder().currentValue(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] { ScopedPrice.builder().country("country") },
-                new Object[] { ScopedPrice.builder()
+                new Object[] { "country", ScopedPrice.builder().country("country") },
+                new Object[] { "customerGroup", ScopedPrice.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] { ScopedPrice.builder()
-                        .channel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
-                new Object[] { ScopedPrice.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ScopedPrice.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ScopedPrice.builder()
-                        .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) },
-                new Object[] {
+                new Object[] { "channel",
+                        ScopedPrice.builder()
+                                .channel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
+                new Object[] { "validFrom", ScopedPrice.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        ScopedPrice.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "discounted",
+                        ScopedPrice.builder()
+                                .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) },
+                new Object[] { "custom",
                         ScopedPrice.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/UpdateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/UpdateActionTest.java
index 8c22a650e13..b5cf90e6fae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/UpdateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/UpdateActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class UpdateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(UpdateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, UpdateActionBuilder builder) {
         UpdateAction updateAction = builder.buildUnchecked();
         Assertions.assertThat(updateAction).isInstanceOf(UpdateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { UpdateAction.builder().action("action") } };
+        return new Object[][] { new Object[] { "action", UpdateAction.builder().action("action") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/UpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/UpdateTest.java
index 2f83ac3a853..0cbb62040b9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/UpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/common/UpdateTest.java
@@ -3,31 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class UpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(UpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, UpdateBuilder builder) {
         Update update = builder.buildUnchecked();
         Assertions.assertThat(update).isInstanceOf(Update.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Update.builder().version(2L) }, new Object[] { Update.builder()
-                .actions(Collections.singletonList(new com.commercetools.api.models.common.UpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", Update.builder().version(2L) },
+                new Object[] { "actions", Update.builder()
+                        .actions(
+                            Collections.singletonList(new com.commercetools.api.models.common.UpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectDraftTest.java
index f098a8d81a4..33c32cc41b9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectDraftTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.custom_object;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomObjectDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomObjectDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomObjectDraftBuilder builder) {
         CustomObjectDraft customObjectDraft = builder.buildUnchecked();
         Assertions.assertThat(customObjectDraft).isInstanceOf(CustomObjectDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomObjectDraft.builder().container("container") },
-                new Object[] { CustomObjectDraft.builder().key("key") },
-                new Object[] { CustomObjectDraft.builder().value("value") },
-                new Object[] { CustomObjectDraft.builder().version(2L) } };
+        return new Object[][] { new Object[] { "container", CustomObjectDraft.builder().container("container") },
+                new Object[] { "key", CustomObjectDraft.builder().key("key") },
+                new Object[] { "value", CustomObjectDraft.builder().value("value") },
+                new Object[] { "version", CustomObjectDraft.builder().version(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectPagedQueryResponseTest.java
index 184fd8e938c..efeb11a20a8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomObjectPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomObjectPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomObjectPagedQueryResponseBuilder builder) {
         CustomObjectPagedQueryResponse customObjectPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(customObjectPagedQueryResponse).isInstanceOf(CustomObjectPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomObjectPagedQueryResponse.builder().limit(7L) },
-                new Object[] { CustomObjectPagedQueryResponse.builder().offset(3L) },
-                new Object[] { CustomObjectPagedQueryResponse.builder().count(2L) },
-                new Object[] { CustomObjectPagedQueryResponse.builder().total(1L) },
-                new Object[] { CustomObjectPagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.custom_object.CustomObjectImpl())) } };
+        return new Object[][] { new Object[] { "limit", CustomObjectPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", CustomObjectPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", CustomObjectPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", CustomObjectPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        CustomObjectPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.custom_object.CustomObjectImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectReferenceTest.java
index 22825352f96..af6a806689a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.custom_object;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomObjectReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomObjectReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomObjectReferenceBuilder builder) {
         CustomObjectReference customObjectReference = builder.buildUnchecked();
         Assertions.assertThat(customObjectReference).isInstanceOf(CustomObjectReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomObjectReference.builder()
-                        .obj(new com.commercetools.api.models.custom_object.CustomObjectImpl()) },
-                new Object[] { CustomObjectReference.builder().id("id") } };
+                new Object[] { "obj",
+                        CustomObjectReference.builder()
+                                .obj(new com.commercetools.api.models.custom_object.CustomObjectImpl()) },
+                new Object[] { "id", CustomObjectReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectTest.java
index 20d5b6f66f2..b5c8b62d68b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/custom_object/CustomObjectTest.java
@@ -3,40 +3,35 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomObjectTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomObjectBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomObjectBuilder builder) {
         CustomObject customObject = builder.buildUnchecked();
         Assertions.assertThat(customObject).isInstanceOf(CustomObject.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomObject.builder().id("id") },
-                new Object[] { CustomObject.builder().version(2L) },
-                new Object[] { CustomObject.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CustomObject.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CustomObject.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", CustomObject.builder().id("id") },
+                new Object[] { "version", CustomObject.builder().version(2L) },
+                new Object[] { "createdAt",
+                        CustomObject.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        CustomObject.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        CustomObject.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         CustomObject.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { CustomObject.builder().container("container") },
-                new Object[] { CustomObject.builder().key("key") },
-                new Object[] { CustomObject.builder().value("value") } };
+                new Object[] { "container", CustomObject.builder().container("container") },
+                new Object[] { "key", CustomObject.builder().key("key") },
+                new Object[] { "value", CustomObject.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddAddressActionTest.java
index 60e84d41187..ebfa38c038a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddAddressActionBuilder builder) {
         CustomerAddAddressAction customerAddAddressAction = builder.buildUnchecked();
         Assertions.assertThat(customerAddAddressAction).isInstanceOf(CustomerAddAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddAddressAction.builder()
+        return new Object[][] { new Object[] { "address", CustomerAddAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddBillingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddBillingAddressIdActionTest.java
index c7f6f7a4ef5..585f97d8d06 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddBillingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddBillingAddressIdActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddBillingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddBillingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddBillingAddressIdActionBuilder builder) {
         CustomerAddBillingAddressIdAction customerAddBillingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(customerAddBillingAddressIdAction).isInstanceOf(CustomerAddBillingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddBillingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { CustomerAddBillingAddressIdAction.builder().addressKey("addressKey") } };
+        return new Object[][] {
+                new Object[] { "addressId", CustomerAddBillingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey", CustomerAddBillingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddCustomerGroupAssignmentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddCustomerGroupAssignmentActionTest.java
index d98a593faaa..7bbd56dc98e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddCustomerGroupAssignmentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddCustomerGroupAssignmentActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddCustomerGroupAssignmentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddCustomerGroupAssignmentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddCustomerGroupAssignmentActionBuilder builder) {
         CustomerAddCustomerGroupAssignmentAction customerAddCustomerGroupAssignmentAction = builder.buildUnchecked();
         Assertions.assertThat(customerAddCustomerGroupAssignmentAction)
                 .isInstanceOf(CustomerAddCustomerGroupAssignmentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddCustomerGroupAssignmentAction.builder()
-                .customerGroupAssignment(
-                    new com.commercetools.api.models.customer.CustomerGroupAssignmentDraftImpl()) } };
+        return new Object[][] { new Object[] { "customerGroupAssignment",
+                CustomerAddCustomerGroupAssignmentAction.builder()
+                        .customerGroupAssignment(
+                            new com.commercetools.api.models.customer.CustomerGroupAssignmentDraftImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddShippingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddShippingAddressIdActionTest.java
index 6c2408204b0..21c3d048672 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddShippingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddShippingAddressIdActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddShippingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddShippingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddShippingAddressIdActionBuilder builder) {
         CustomerAddShippingAddressIdAction customerAddShippingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(customerAddShippingAddressIdAction)
                 .isInstanceOf(CustomerAddShippingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddShippingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { CustomerAddShippingAddressIdAction.builder().addressKey("addressKey") } };
+        return new Object[][] {
+                new Object[] { "addressId", CustomerAddShippingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey", CustomerAddShippingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddStoreActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddStoreActionTest.java
index afda5ead842..fb7cd53937e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddStoreActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerAddStoreActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddStoreActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddStoreActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddStoreActionBuilder builder) {
         CustomerAddStoreAction customerAddStoreAction = builder.buildUnchecked();
         Assertions.assertThat(customerAddStoreAction).isInstanceOf(CustomerAddStoreAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddStoreAction.builder()
+        return new Object[][] { new Object[] { "store", CustomerAddStoreAction.builder()
                 .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerChangeAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerChangeAddressActionTest.java
index c31a52014c9..b5bb1fbb083 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerChangeAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerChangeAddressActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerChangeAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerChangeAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerChangeAddressActionBuilder builder) {
         CustomerChangeAddressAction customerChangeAddressAction = builder.buildUnchecked();
         Assertions.assertThat(customerChangeAddressAction).isInstanceOf(CustomerChangeAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerChangeAddressAction.builder().addressId("addressId") },
-                new Object[] { CustomerChangeAddressAction.builder().addressKey("addressKey") },
-                new Object[] { CustomerChangeAddressAction.builder()
+        return new Object[][] {
+                new Object[] { "addressId", CustomerChangeAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey", CustomerChangeAddressAction.builder().addressKey("addressKey") },
+                new Object[] { "address", CustomerChangeAddressAction.builder()
                         .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerChangeEmailActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerChangeEmailActionTest.java
index adb4fc3075a..694a5507216 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerChangeEmailActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerChangeEmailActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerChangeEmailActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerChangeEmailActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerChangeEmailActionBuilder builder) {
         CustomerChangeEmailAction customerChangeEmailAction = builder.buildUnchecked();
         Assertions.assertThat(customerChangeEmailAction).isInstanceOf(CustomerChangeEmailAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerChangeEmailAction.builder().email("email") } };
+        return new Object[][] { new Object[] { "email", CustomerChangeEmailAction.builder().email("email") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerChangePasswordTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerChangePasswordTest.java
index 44d7f0efce2..d4177e76610 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerChangePasswordTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerChangePasswordTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerChangePasswordTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerChangePasswordBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerChangePasswordBuilder builder) {
         CustomerChangePassword customerChangePassword = builder.buildUnchecked();
         Assertions.assertThat(customerChangePassword).isInstanceOf(CustomerChangePassword.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerChangePassword.builder().id("id") },
-                new Object[] { CustomerChangePassword.builder().version(2L) },
-                new Object[] { CustomerChangePassword.builder().currentPassword("currentPassword") },
-                new Object[] { CustomerChangePassword.builder().newPassword("newPassword") } };
+        return new Object[][] { new Object[] { "id", CustomerChangePassword.builder().id("id") },
+                new Object[] { "version", CustomerChangePassword.builder().version(2L) },
+                new Object[] { "currentPassword", CustomerChangePassword.builder().currentPassword("currentPassword") },
+                new Object[] { "newPassword", CustomerChangePassword.builder().newPassword("newPassword") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerCreateEmailTokenTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerCreateEmailTokenTest.java
index 47fc3fc0298..fbe67c30407 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerCreateEmailTokenTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerCreateEmailTokenTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCreateEmailTokenTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCreateEmailTokenBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCreateEmailTokenBuilder builder) {
         CustomerCreateEmailToken customerCreateEmailToken = builder.buildUnchecked();
         Assertions.assertThat(customerCreateEmailToken).isInstanceOf(CustomerCreateEmailToken.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerCreateEmailToken.builder().id("id") },
-                new Object[] { CustomerCreateEmailToken.builder().version(2L) },
-                new Object[] { CustomerCreateEmailToken.builder().ttlMinutes(1L) } };
+        return new Object[][] { new Object[] { "id", CustomerCreateEmailToken.builder().id("id") },
+                new Object[] { "version", CustomerCreateEmailToken.builder().version(2L) },
+                new Object[] { "ttlMinutes", CustomerCreateEmailToken.builder().ttlMinutes(1L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerCreatePasswordResetTokenTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerCreatePasswordResetTokenTest.java
index e86273d43a7..8711289ab54 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerCreatePasswordResetTokenTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerCreatePasswordResetTokenTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCreatePasswordResetTokenTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCreatePasswordResetTokenBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCreatePasswordResetTokenBuilder builder) {
         CustomerCreatePasswordResetToken customerCreatePasswordResetToken = builder.buildUnchecked();
         Assertions.assertThat(customerCreatePasswordResetToken).isInstanceOf(CustomerCreatePasswordResetToken.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerCreatePasswordResetToken.builder().email("email") },
-                new Object[] { CustomerCreatePasswordResetToken.builder().ttlMinutes(1L) } };
+        return new Object[][] { new Object[] { "email", CustomerCreatePasswordResetToken.builder().email("email") },
+                new Object[] { "ttlMinutes", CustomerCreatePasswordResetToken.builder().ttlMinutes(1L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerDraftTest.java
index af92311fee9..45ee3a42dae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerDraftTest.java
@@ -4,70 +4,68 @@
 import java.time.LocalDate;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerDraftBuilder builder) {
         CustomerDraft customerDraft = builder.buildUnchecked();
         Assertions.assertThat(customerDraft).isInstanceOf(CustomerDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerDraft.builder().key("key") },
-                new Object[] { CustomerDraft.builder().customerNumber("customerNumber") },
-                new Object[] { CustomerDraft.builder().externalId("externalId") },
-                new Object[] { CustomerDraft.builder().email("email") },
-                new Object[] { CustomerDraft.builder().password("password") },
-                new Object[] { CustomerDraft.builder().firstName("firstName") },
-                new Object[] { CustomerDraft.builder().lastName("lastName") },
-                new Object[] { CustomerDraft.builder().middleName("middleName") },
-                new Object[] { CustomerDraft.builder().title("title") },
-                new Object[] { CustomerDraft.builder().anonymousCartId("anonymousCartId") },
-                new Object[] { CustomerDraft.builder()
-                        .anonymousCart(new com.commercetools.api.models.cart.CartResourceIdentifierImpl()) },
-                new Object[] { CustomerDraft.builder().anonymousId("anonymousId") },
-                new Object[] { CustomerDraft.builder().dateOfBirth(LocalDate.parse("2023-06-01")) },
-                new Object[] { CustomerDraft.builder().companyName("companyName") },
-                new Object[] { CustomerDraft.builder().vatId("vatId") },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", CustomerDraft.builder().key("key") },
+                new Object[] { "customerNumber", CustomerDraft.builder().customerNumber("customerNumber") },
+                new Object[] { "externalId", CustomerDraft.builder().externalId("externalId") },
+                new Object[] { "email", CustomerDraft.builder().email("email") },
+                new Object[] { "password", CustomerDraft.builder().password("password") },
+                new Object[] { "firstName", CustomerDraft.builder().firstName("firstName") },
+                new Object[] { "lastName", CustomerDraft.builder().lastName("lastName") },
+                new Object[] { "middleName", CustomerDraft.builder().middleName("middleName") },
+                new Object[] { "title", CustomerDraft.builder().title("title") },
+                new Object[] { "anonymousCartId", CustomerDraft.builder().anonymousCartId("anonymousCartId") },
+                new Object[] { "anonymousCart",
+                        CustomerDraft.builder()
+                                .anonymousCart(new com.commercetools.api.models.cart.CartResourceIdentifierImpl()) },
+                new Object[] { "anonymousId", CustomerDraft.builder().anonymousId("anonymousId") },
+                new Object[] { "dateOfBirth", CustomerDraft.builder().dateOfBirth(LocalDate.parse("2023-06-01")) },
+                new Object[] { "companyName", CustomerDraft.builder().companyName("companyName") },
+                new Object[] { "vatId", CustomerDraft.builder().vatId("vatId") },
+                new Object[] { "addresses",
                         CustomerDraft.builder()
                                 .addresses(Collections
                                         .singletonList(new com.commercetools.api.models.common.BaseAddressImpl())) },
-                new Object[] { CustomerDraft.builder().defaultShippingAddress(4) },
-                new Object[] { CustomerDraft.builder().shippingAddresses(Collections.singletonList(5)) },
-                new Object[] { CustomerDraft.builder().defaultBillingAddress(3) },
-                new Object[] { CustomerDraft.builder().billingAddresses(Collections.singletonList(7)) },
-                new Object[] { CustomerDraft.builder().isEmailVerified(true) },
-                new Object[] { CustomerDraft.builder()
+                new Object[] { "defaultShippingAddress", CustomerDraft.builder().defaultShippingAddress(4) },
+                new Object[] { "shippingAddresses",
+                        CustomerDraft.builder().shippingAddresses(Collections.singletonList(5)) },
+                new Object[] { "defaultBillingAddress", CustomerDraft.builder().defaultBillingAddress(3) },
+                new Object[] { "billingAddresses",
+                        CustomerDraft.builder().billingAddresses(Collections.singletonList(7)) },
+                new Object[] { "isEmailVerified", CustomerDraft.builder().isEmailVerified(true) },
+                new Object[] { "customerGroup", CustomerDraft.builder()
                         .customerGroup(
                             new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) },
-                new Object[] {
+                new Object[] { "custom",
                         CustomerDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { CustomerDraft.builder().locale("locale") },
-                new Object[] { CustomerDraft.builder().salutation("salutation") },
-                new Object[] { CustomerDraft.builder()
-                        .stores(Collections
-                                .singletonList(new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) },
-                new Object[] { CustomerDraft.builder()
-                        .authenticationMode(
-                            com.commercetools.api.models.customer.AuthenticationMode.findEnum("Password")) },
-                new Object[] { CustomerDraft.builder()
-                        .customerGroupAssignments(Collections.singletonList(
-                            new com.commercetools.api.models.customer.CustomerGroupAssignmentDraftImpl())) } };
+                new Object[] { "locale", CustomerDraft.builder().locale("locale") },
+                new Object[] { "salutation", CustomerDraft.builder().salutation("salutation") },
+                new Object[] { "stores",
+                        CustomerDraft.builder()
+                                .stores(Collections.singletonList(
+                                    new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) },
+                new Object[] { "authenticationMode",
+                        CustomerDraft.builder()
+                                .authenticationMode(
+                                    com.commercetools.api.models.customer.AuthenticationMode.findEnum("Password")) },
+                new Object[] { "customerGroupAssignments",
+                        CustomerDraft.builder()
+                                .customerGroupAssignments(Collections.singletonList(
+                                    new com.commercetools.api.models.customer.CustomerGroupAssignmentDraftImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerEmailTokenReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerEmailTokenReferenceTest.java
index 46cca9537fe..66ab5b2dd18 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerEmailTokenReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerEmailTokenReferenceTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerEmailTokenReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerEmailTokenReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerEmailTokenReferenceBuilder builder) {
         CustomerEmailTokenReference customerEmailTokenReference = builder.buildUnchecked();
         Assertions.assertThat(customerEmailTokenReference).isInstanceOf(CustomerEmailTokenReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerEmailTokenReference.builder().id("id") } };
+        return new Object[][] { new Object[] { "id", CustomerEmailTokenReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerEmailVerifyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerEmailVerifyTest.java
index d5577514d4f..3d985c3bf43 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerEmailVerifyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerEmailVerifyTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerEmailVerifyTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerEmailVerifyBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerEmailVerifyBuilder builder) {
         CustomerEmailVerify customerEmailVerify = builder.buildUnchecked();
         Assertions.assertThat(customerEmailVerify).isInstanceOf(CustomerEmailVerify.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerEmailVerify.builder().version(2L) },
-                new Object[] { CustomerEmailVerify.builder().tokenValue("tokenValue") } };
+        return new Object[][] { new Object[] { "version", CustomerEmailVerify.builder().version(2L) },
+                new Object[] { "tokenValue", CustomerEmailVerify.builder().tokenValue("tokenValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerGroupAssignmentDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerGroupAssignmentDraftTest.java
index 646ea5b0986..1a4ea6f37ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerGroupAssignmentDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerGroupAssignmentDraftTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupAssignmentDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupAssignmentDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupAssignmentDraftBuilder builder) {
         CustomerGroupAssignmentDraft customerGroupAssignmentDraft = builder.buildUnchecked();
         Assertions.assertThat(customerGroupAssignmentDraft).isInstanceOf(CustomerGroupAssignmentDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupAssignmentDraft.builder()
-                .customerGroup(
-                    new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) } };
+        return new Object[][] { new Object[] { "customerGroup",
+                CustomerGroupAssignmentDraft.builder()
+                        .customerGroup(
+                            new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerGroupAssignmentTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerGroupAssignmentTest.java
index 9f52547a370..9e420c5fe0f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerGroupAssignmentTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerGroupAssignmentTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupAssignmentTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupAssignmentBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupAssignmentBuilder builder) {
         CustomerGroupAssignment customerGroupAssignment = builder.buildUnchecked();
         Assertions.assertThat(customerGroupAssignment).isInstanceOf(CustomerGroupAssignment.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupAssignment.builder()
+        return new Object[][] { new Object[] { "customerGroup", CustomerGroupAssignment.builder()
                 .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerPagedQueryResponseTest.java
index cf64adbb1f8..dd351b4d355 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerPagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerPagedQueryResponseBuilder builder) {
         CustomerPagedQueryResponse customerPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(customerPagedQueryResponse).isInstanceOf(CustomerPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerPagedQueryResponse.builder().limit(7L) },
-                new Object[] { CustomerPagedQueryResponse.builder().offset(3L) },
-                new Object[] { CustomerPagedQueryResponse.builder().count(2L) },
-                new Object[] { CustomerPagedQueryResponse.builder().total(1L) },
-                new Object[] { CustomerPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", CustomerPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", CustomerPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", CustomerPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", CustomerPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", CustomerPagedQueryResponse.builder()
                         .results(
                             Collections.singletonList(new com.commercetools.api.models.customer.CustomerImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerPasswordTokenReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerPasswordTokenReferenceTest.java
index daa141467e9..a36039b8673 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerPasswordTokenReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerPasswordTokenReferenceTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerPasswordTokenReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerPasswordTokenReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerPasswordTokenReferenceBuilder builder) {
         CustomerPasswordTokenReference customerPasswordTokenReference = builder.buildUnchecked();
         Assertions.assertThat(customerPasswordTokenReference).isInstanceOf(CustomerPasswordTokenReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerPasswordTokenReference.builder().id("id") } };
+        return new Object[][] { new Object[] { "id", CustomerPasswordTokenReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerReferenceTest.java
index e672e25761b..6bba50112ec 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerReferenceTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerReferenceBuilder builder) {
         CustomerReference customerReference = builder.buildUnchecked();
         Assertions.assertThat(customerReference).isInstanceOf(CustomerReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "obj",
                         CustomerReference.builder().obj(new com.commercetools.api.models.customer.CustomerImpl()) },
-                new Object[] { CustomerReference.builder().id("id") } };
+                new Object[] { "id", CustomerReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveAddressActionTest.java
index 886a87fa876..f100ecc7b46 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveAddressActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerRemoveAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerRemoveAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerRemoveAddressActionBuilder builder) {
         CustomerRemoveAddressAction customerRemoveAddressAction = builder.buildUnchecked();
         Assertions.assertThat(customerRemoveAddressAction).isInstanceOf(CustomerRemoveAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerRemoveAddressAction.builder().addressId("addressId") },
-                new Object[] { CustomerRemoveAddressAction.builder().addressKey("addressKey") } };
+        return new Object[][] {
+                new Object[] { "addressId", CustomerRemoveAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey", CustomerRemoveAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveBillingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveBillingAddressIdActionTest.java
index ae027664df4..e43574295a8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveBillingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveBillingAddressIdActionTest.java
@@ -1,32 +1,26 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerRemoveBillingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerRemoveBillingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerRemoveBillingAddressIdActionBuilder builder) {
         CustomerRemoveBillingAddressIdAction customerRemoveBillingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(customerRemoveBillingAddressIdAction)
                 .isInstanceOf(CustomerRemoveBillingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerRemoveBillingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { CustomerRemoveBillingAddressIdAction.builder().addressKey("addressKey") } };
+        return new Object[][] {
+                new Object[] { "addressId", CustomerRemoveBillingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        CustomerRemoveBillingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveCustomerGroupAssignmentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveCustomerGroupAssignmentActionTest.java
index 4eff7f3183d..8b4746d4101 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveCustomerGroupAssignmentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveCustomerGroupAssignmentActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerRemoveCustomerGroupAssignmentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerRemoveCustomerGroupAssignmentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerRemoveCustomerGroupAssignmentActionBuilder builder) {
         CustomerRemoveCustomerGroupAssignmentAction customerRemoveCustomerGroupAssignmentAction = builder
                 .buildUnchecked();
         Assertions.assertThat(customerRemoveCustomerGroupAssignmentAction)
                 .isInstanceOf(CustomerRemoveCustomerGroupAssignmentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerRemoveCustomerGroupAssignmentAction.builder()
-                .customerGroup(
-                    new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) } };
+        return new Object[][] { new Object[] { "customerGroup",
+                CustomerRemoveCustomerGroupAssignmentAction.builder()
+                        .customerGroup(
+                            new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveShippingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveShippingAddressIdActionTest.java
index 2c17d5b1093..0c6e579ae57 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveShippingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveShippingAddressIdActionTest.java
@@ -1,32 +1,26 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerRemoveShippingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerRemoveShippingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerRemoveShippingAddressIdActionBuilder builder) {
         CustomerRemoveShippingAddressIdAction customerRemoveShippingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(customerRemoveShippingAddressIdAction)
                 .isInstanceOf(CustomerRemoveShippingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerRemoveShippingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { CustomerRemoveShippingAddressIdAction.builder().addressKey("addressKey") } };
+        return new Object[][] {
+                new Object[] { "addressId", CustomerRemoveShippingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        CustomerRemoveShippingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveStoreActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveStoreActionTest.java
index 5c8268e4690..72d12438658 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveStoreActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerRemoveStoreActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerRemoveStoreActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerRemoveStoreActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerRemoveStoreActionBuilder builder) {
         CustomerRemoveStoreAction customerRemoveStoreAction = builder.buildUnchecked();
         Assertions.assertThat(customerRemoveStoreAction).isInstanceOf(CustomerRemoveStoreAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerRemoveStoreAction.builder()
+        return new Object[][] { new Object[] { "store", CustomerRemoveStoreAction.builder()
                 .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerResetPasswordTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerResetPasswordTest.java
index a9511e4a74d..11b0b7deeab 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerResetPasswordTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerResetPasswordTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerResetPasswordTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerResetPasswordBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerResetPasswordBuilder builder) {
         CustomerResetPassword customerResetPassword = builder.buildUnchecked();
         Assertions.assertThat(customerResetPassword).isInstanceOf(CustomerResetPassword.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerResetPassword.builder().tokenValue("tokenValue") },
-                new Object[] { CustomerResetPassword.builder().newPassword("newPassword") },
-                new Object[] { CustomerResetPassword.builder().version(2L) } };
+        return new Object[][] { new Object[] { "tokenValue", CustomerResetPassword.builder().tokenValue("tokenValue") },
+                new Object[] { "newPassword", CustomerResetPassword.builder().newPassword("newPassword") },
+                new Object[] { "version", CustomerResetPassword.builder().version(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerResourceIdentifierTest.java
index 93d5d3f6d16..6ec77e6126e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerResourceIdentifierBuilder builder) {
         CustomerResourceIdentifier customerResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(customerResourceIdentifier).isInstanceOf(CustomerResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerResourceIdentifier.builder().id("id") },
-                new Object[] { CustomerResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", CustomerResourceIdentifier.builder().id("id") },
+                new Object[] { "key", CustomerResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetAddressCustomFieldActionTest.java
index b687135abfe..dec9bcd6657 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetAddressCustomFieldActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetAddressCustomFieldActionBuilder builder) {
         CustomerSetAddressCustomFieldAction customerSetAddressCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetAddressCustomFieldAction)
                 .isInstanceOf(CustomerSetAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetAddressCustomFieldAction.builder().addressId("addressId") },
-                new Object[] { CustomerSetAddressCustomFieldAction.builder().name("name") },
-                new Object[] { CustomerSetAddressCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "addressId", CustomerSetAddressCustomFieldAction.builder().addressId("addressId") },
+                new Object[] { "name", CustomerSetAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CustomerSetAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetAddressCustomTypeActionTest.java
index ece77c18d10..a64e20b2c56 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetAddressCustomTypeActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetAddressCustomTypeActionBuilder builder) {
         CustomerSetAddressCustomTypeAction customerSetAddressCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetAddressCustomTypeAction)
                 .isInstanceOf(CustomerSetAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetAddressCustomTypeAction.builder().addressId("addressId") },
-                new Object[] { CustomerSetAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CustomerSetAddressCustomTypeAction.builder()
+        return new Object[][] {
+                new Object[] { "addressId", CustomerSetAddressCustomTypeAction.builder().addressId("addressId") },
+                new Object[] { "type",
+                        CustomerSetAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CustomerSetAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetAuthenticationModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetAuthenticationModeActionTest.java
index c78cdb02ea9..d5201512fee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetAuthenticationModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetAuthenticationModeActionTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetAuthenticationModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetAuthenticationModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetAuthenticationModeActionBuilder builder) {
         CustomerSetAuthenticationModeAction customerSetAuthenticationModeAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetAuthenticationModeAction)
                 .isInstanceOf(CustomerSetAuthenticationModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerSetAuthenticationModeAction.builder()
+                new Object[] { "authMode", CustomerSetAuthenticationModeAction.builder()
                         .authMode(com.commercetools.api.models.customer.AuthenticationMode.findEnum("Password")) },
-                new Object[] { CustomerSetAuthenticationModeAction.builder().password("password") } };
+                new Object[] { "password", CustomerSetAuthenticationModeAction.builder().password("password") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCompanyNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCompanyNameActionTest.java
index 326a90ac38b..f31fbd4cf10 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCompanyNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCompanyNameActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetCompanyNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetCompanyNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetCompanyNameActionBuilder builder) {
         CustomerSetCompanyNameAction customerSetCompanyNameAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetCompanyNameAction).isInstanceOf(CustomerSetCompanyNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetCompanyNameAction.builder().companyName("companyName") } };
+        return new Object[][] {
+                new Object[] { "companyName", CustomerSetCompanyNameAction.builder().companyName("companyName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomFieldActionTest.java
index b999194f22c..992fd16c00c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetCustomFieldActionBuilder builder) {
         CustomerSetCustomFieldAction customerSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetCustomFieldAction).isInstanceOf(CustomerSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetCustomFieldAction.builder().name("name") },
-                new Object[] { CustomerSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", CustomerSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CustomerSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomTypeActionTest.java
index eaee39e56e6..eb627b97496 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetCustomTypeActionBuilder builder) {
         CustomerSetCustomTypeAction customerSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetCustomTypeAction).isInstanceOf(CustomerSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CustomerSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        CustomerSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CustomerSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomerGroupActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomerGroupActionTest.java
index 45d90da615c..383bf900760 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomerGroupActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomerGroupActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetCustomerGroupActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetCustomerGroupActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetCustomerGroupActionBuilder builder) {
         CustomerSetCustomerGroupAction customerSetCustomerGroupAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetCustomerGroupAction).isInstanceOf(CustomerSetCustomerGroupAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetCustomerGroupAction.builder()
-                .customerGroup(
-                    new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) } };
+        return new Object[][] { new Object[] { "customerGroup",
+                CustomerSetCustomerGroupAction.builder()
+                        .customerGroup(
+                            new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomerGroupAssignmentsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomerGroupAssignmentsActionTest.java
index f353312bff7..d58f0c2664e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomerGroupAssignmentsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomerGroupAssignmentsActionTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetCustomerGroupAssignmentsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetCustomerGroupAssignmentsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetCustomerGroupAssignmentsActionBuilder builder) {
         CustomerSetCustomerGroupAssignmentsAction customerSetCustomerGroupAssignmentsAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetCustomerGroupAssignmentsAction)
                 .isInstanceOf(CustomerSetCustomerGroupAssignmentsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetCustomerGroupAssignmentsAction.builder()
-                .customerGroupAssignments(Collections.singletonList(
-                    new com.commercetools.api.models.customer.CustomerGroupAssignmentDraftImpl())) } };
+        return new Object[][] { new Object[] { "customerGroupAssignments",
+                CustomerSetCustomerGroupAssignmentsAction.builder()
+                        .customerGroupAssignments(Collections.singletonList(
+                            new com.commercetools.api.models.customer.CustomerGroupAssignmentDraftImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomerNumberActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomerNumberActionTest.java
index 92ee82cc329..0cdeb3810cd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomerNumberActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetCustomerNumberActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetCustomerNumberActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetCustomerNumberActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetCustomerNumberActionBuilder builder) {
         CustomerSetCustomerNumberAction customerSetCustomerNumberAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetCustomerNumberAction).isInstanceOf(CustomerSetCustomerNumberAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { CustomerSetCustomerNumberAction.builder().customerNumber("customerNumber") } };
+        return new Object[][] { new Object[] { "customerNumber",
+                CustomerSetCustomerNumberAction.builder().customerNumber("customerNumber") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetDateOfBirthActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetDateOfBirthActionTest.java
index c550ade4888..ba5115b391c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetDateOfBirthActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetDateOfBirthActionTest.java
@@ -3,31 +3,23 @@
 
 import java.time.LocalDate;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetDateOfBirthActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetDateOfBirthActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetDateOfBirthActionBuilder builder) {
         CustomerSetDateOfBirthAction customerSetDateOfBirthAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetDateOfBirthAction).isInstanceOf(CustomerSetDateOfBirthAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { CustomerSetDateOfBirthAction.builder().dateOfBirth(LocalDate.parse("2023-06-01")) } };
+        return new Object[][] { new Object[] { "dateOfBirth",
+                CustomerSetDateOfBirthAction.builder().dateOfBirth(LocalDate.parse("2023-06-01")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetDefaultBillingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetDefaultBillingAddressActionTest.java
index cd9cb40c20d..534f708c2ea 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetDefaultBillingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetDefaultBillingAddressActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetDefaultBillingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetDefaultBillingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetDefaultBillingAddressActionBuilder builder) {
         CustomerSetDefaultBillingAddressAction customerSetDefaultBillingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetDefaultBillingAddressAction)
                 .isInstanceOf(CustomerSetDefaultBillingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerSetDefaultBillingAddressAction.builder().addressId("addressId") },
-                new Object[] { CustomerSetDefaultBillingAddressAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId", CustomerSetDefaultBillingAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        CustomerSetDefaultBillingAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetDefaultShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetDefaultShippingAddressActionTest.java
index 3c3688dbc2e..2a60a34957f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetDefaultShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetDefaultShippingAddressActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetDefaultShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetDefaultShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetDefaultShippingAddressActionBuilder builder) {
         CustomerSetDefaultShippingAddressAction customerSetDefaultShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetDefaultShippingAddressAction)
                 .isInstanceOf(CustomerSetDefaultShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerSetDefaultShippingAddressAction.builder().addressId("addressId") },
-                new Object[] { CustomerSetDefaultShippingAddressAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId", CustomerSetDefaultShippingAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        CustomerSetDefaultShippingAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetExternalIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetExternalIdActionTest.java
index 166faa914fe..be4a0f33e1e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetExternalIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetExternalIdActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetExternalIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetExternalIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetExternalIdActionBuilder builder) {
         CustomerSetExternalIdAction customerSetExternalIdAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetExternalIdAction).isInstanceOf(CustomerSetExternalIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetExternalIdAction.builder().externalId("externalId") } };
+        return new Object[][] {
+                new Object[] { "externalId", CustomerSetExternalIdAction.builder().externalId("externalId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetFirstNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetFirstNameActionTest.java
index 1796ffbffd2..5fe831178ea 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetFirstNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetFirstNameActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetFirstNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetFirstNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetFirstNameActionBuilder builder) {
         CustomerSetFirstNameAction customerSetFirstNameAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetFirstNameAction).isInstanceOf(CustomerSetFirstNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetFirstNameAction.builder().firstName("firstName") } };
+        return new Object[][] {
+                new Object[] { "firstName", CustomerSetFirstNameAction.builder().firstName("firstName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetKeyActionTest.java
index 654a9f5f663..414e6ccd59c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetKeyActionBuilder builder) {
         CustomerSetKeyAction customerSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetKeyAction).isInstanceOf(CustomerSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", CustomerSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetLastNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetLastNameActionTest.java
index 4db1e36e008..e98f1c47d8d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetLastNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetLastNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetLastNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetLastNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetLastNameActionBuilder builder) {
         CustomerSetLastNameAction customerSetLastNameAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetLastNameAction).isInstanceOf(CustomerSetLastNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetLastNameAction.builder().lastName("lastName") } };
+        return new Object[][] { new Object[] { "lastName", CustomerSetLastNameAction.builder().lastName("lastName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetLocaleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetLocaleActionTest.java
index 5d37c6dd1ed..4842e70dbf2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetLocaleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetLocaleActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetLocaleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetLocaleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetLocaleActionBuilder builder) {
         CustomerSetLocaleAction customerSetLocaleAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetLocaleAction).isInstanceOf(CustomerSetLocaleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetLocaleAction.builder().locale("locale") } };
+        return new Object[][] { new Object[] { "locale", CustomerSetLocaleAction.builder().locale("locale") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetMiddleNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetMiddleNameActionTest.java
index a6243e8fff7..e9a43a70ecc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetMiddleNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetMiddleNameActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetMiddleNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetMiddleNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetMiddleNameActionBuilder builder) {
         CustomerSetMiddleNameAction customerSetMiddleNameAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetMiddleNameAction).isInstanceOf(CustomerSetMiddleNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetMiddleNameAction.builder().middleName("middleName") } };
+        return new Object[][] {
+                new Object[] { "middleName", CustomerSetMiddleNameAction.builder().middleName("middleName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetSalutationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetSalutationActionTest.java
index 17ee42f0235..adf4460ba2b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetSalutationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetSalutationActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetSalutationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetSalutationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetSalutationActionBuilder builder) {
         CustomerSetSalutationAction customerSetSalutationAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetSalutationAction).isInstanceOf(CustomerSetSalutationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetSalutationAction.builder().salutation("salutation") } };
+        return new Object[][] {
+                new Object[] { "salutation", CustomerSetSalutationAction.builder().salutation("salutation") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetStoresActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetStoresActionTest.java
index faf348f8649..eecc670856f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetStoresActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetStoresActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetStoresActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetStoresActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetStoresActionBuilder builder) {
         CustomerSetStoresAction customerSetStoresAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetStoresAction).isInstanceOf(CustomerSetStoresAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetStoresAction.builder()
-                .stores(Collections
-                        .singletonList(new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) } };
+        return new Object[][] { new Object[] { "stores",
+                CustomerSetStoresAction.builder()
+                        .stores(Collections.singletonList(
+                            new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetTitleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetTitleActionTest.java
index 19c89430139..f0839ed2f4f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetTitleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetTitleActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetTitleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetTitleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetTitleActionBuilder builder) {
         CustomerSetTitleAction customerSetTitleAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetTitleAction).isInstanceOf(CustomerSetTitleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetTitleAction.builder().title("title") } };
+        return new Object[][] { new Object[] { "title", CustomerSetTitleAction.builder().title("title") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetVatIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetVatIdActionTest.java
index c22a7b2a905..79f81177fd2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetVatIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSetVatIdActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSetVatIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSetVatIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSetVatIdActionBuilder builder) {
         CustomerSetVatIdAction customerSetVatIdAction = builder.buildUnchecked();
         Assertions.assertThat(customerSetVatIdAction).isInstanceOf(CustomerSetVatIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSetVatIdAction.builder().vatId("vatId") } };
+        return new Object[][] { new Object[] { "vatId", CustomerSetVatIdAction.builder().vatId("vatId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSignInResultTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSignInResultTest.java
index aafec895b2e..bc705c30cb4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSignInResultTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSignInResultTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSignInResultTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSignInResultBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSignInResultBuilder builder) {
         CustomerSignInResult customerSignInResult = builder.buildUnchecked();
         Assertions.assertThat(customerSignInResult).isInstanceOf(CustomerSignInResult.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerSignInResult.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerImpl()) },
-                new Object[] {
+                new Object[] { "customer",
+                        CustomerSignInResult.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerImpl()) },
+                new Object[] { "cart",
                         CustomerSignInResult.builder().cart(new com.commercetools.api.models.cart.CartImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSigninTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSigninTest.java
index e8dc210844e..32e802ae4d6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSigninTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerSigninTest.java
@@ -1,39 +1,33 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSigninTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSigninBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSigninBuilder builder) {
         CustomerSignin customerSignin = builder.buildUnchecked();
         Assertions.assertThat(customerSignin).isInstanceOf(CustomerSignin.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSignin.builder().email("email") },
-                new Object[] { CustomerSignin.builder().password("password") },
-                new Object[] { CustomerSignin.builder().anonymousCartId("anonymousCartId") },
-                new Object[] { CustomerSignin.builder()
-                        .anonymousCart(new com.commercetools.api.models.cart.CartResourceIdentifierImpl()) },
-                new Object[] { CustomerSignin.builder()
-                        .anonymousCartSignInMode(com.commercetools.api.models.customer.AnonymousCartSignInMode
-                                .findEnum("MergeWithExistingCustomerCart")) },
-                new Object[] { CustomerSignin.builder().anonymousId("anonymousId") },
-                new Object[] { CustomerSignin.builder().updateProductData(true) } };
+        return new Object[][] { new Object[] { "email", CustomerSignin.builder().email("email") },
+                new Object[] { "password", CustomerSignin.builder().password("password") },
+                new Object[] { "anonymousCartId", CustomerSignin.builder().anonymousCartId("anonymousCartId") },
+                new Object[] { "anonymousCart",
+                        CustomerSignin.builder()
+                                .anonymousCart(new com.commercetools.api.models.cart.CartResourceIdentifierImpl()) },
+                new Object[] { "anonymousCartSignInMode",
+                        CustomerSignin.builder()
+                                .anonymousCartSignInMode(com.commercetools.api.models.customer.AnonymousCartSignInMode
+                                        .findEnum("MergeWithExistingCustomerCart")) },
+                new Object[] { "anonymousId", CustomerSignin.builder().anonymousId("anonymousId") },
+                new Object[] { "updateProductData", CustomerSignin.builder().updateProductData(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerTest.java
index 627fc990531..aa31b1f0168 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerTest.java
@@ -5,68 +5,72 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerBuilder builder) {
         Customer customer = builder.buildUnchecked();
         Assertions.assertThat(customer).isInstanceOf(Customer.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Customer.builder().id("id") },
-                new Object[] { Customer.builder().version(2L) }, new Object[] { Customer.builder().key("key") },
-                new Object[] { Customer.builder().customerNumber("customerNumber") },
-                new Object[] { Customer.builder().externalId("externalId") },
-                new Object[] { Customer.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Customer.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Customer.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Customer.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { Customer.builder().email("email") },
-                new Object[] { Customer.builder().password("password") },
-                new Object[] { Customer.builder().firstName("firstName") },
-                new Object[] { Customer.builder().lastName("lastName") },
-                new Object[] { Customer.builder().middleName("middleName") },
-                new Object[] { Customer.builder().title("title") },
-                new Object[] { Customer.builder().dateOfBirth(LocalDate.parse("2023-06-01")) },
-                new Object[] { Customer.builder().companyName("companyName") },
-                new Object[] { Customer.builder().vatId("vatId") },
-                new Object[] { Customer.builder()
+        return new Object[][] { new Object[] { "id", Customer.builder().id("id") },
+                new Object[] { "version", Customer.builder().version(2L) },
+                new Object[] { "key", Customer.builder().key("key") },
+                new Object[] { "customerNumber", Customer.builder().customerNumber("customerNumber") },
+                new Object[] { "externalId", Customer.builder().externalId("externalId") },
+                new Object[] { "createdAt", Customer.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Customer.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        Customer.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
+                        Customer.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
+                new Object[] { "email", Customer.builder().email("email") },
+                new Object[] { "password", Customer.builder().password("password") },
+                new Object[] { "firstName", Customer.builder().firstName("firstName") },
+                new Object[] { "lastName", Customer.builder().lastName("lastName") },
+                new Object[] { "middleName", Customer.builder().middleName("middleName") },
+                new Object[] { "title", Customer.builder().title("title") },
+                new Object[] { "dateOfBirth", Customer.builder().dateOfBirth(LocalDate.parse("2023-06-01")) },
+                new Object[] { "companyName", Customer.builder().companyName("companyName") },
+                new Object[] { "vatId", Customer.builder().vatId("vatId") },
+                new Object[] { "addresses", Customer.builder()
                         .addresses(Collections.singletonList(new com.commercetools.api.models.common.AddressImpl())) },
-                new Object[] { Customer.builder().defaultShippingAddressId("defaultShippingAddressId") },
-                new Object[] { Customer.builder().shippingAddressIds(Collections.singletonList("shippingAddressIds")) },
-                new Object[] { Customer.builder().defaultBillingAddressId("defaultBillingAddressId") },
-                new Object[] { Customer.builder().billingAddressIds(Collections.singletonList("billingAddressIds")) },
-                new Object[] { Customer.builder().isEmailVerified(true) },
-                new Object[] { Customer.builder()
+                new Object[] { "defaultShippingAddressId",
+                        Customer.builder().defaultShippingAddressId("defaultShippingAddressId") },
+                new Object[] { "shippingAddressIds",
+                        Customer.builder().shippingAddressIds(Collections.singletonList("shippingAddressIds")) },
+                new Object[] { "defaultBillingAddressId",
+                        Customer.builder().defaultBillingAddressId("defaultBillingAddressId") },
+                new Object[] { "billingAddressIds",
+                        Customer.builder().billingAddressIds(Collections.singletonList("billingAddressIds")) },
+                new Object[] { "isEmailVerified", Customer.builder().isEmailVerified(true) },
+                new Object[] { "customerGroup", Customer.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] { Customer.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { Customer.builder().locale("locale") },
-                new Object[] { Customer.builder().salutation("salutation") },
-                new Object[] { Customer.builder()
-                        .stores(Collections
-                                .singletonList(new com.commercetools.api.models.store.StoreKeyReferenceImpl())) },
-                new Object[] { Customer.builder()
-                        .authenticationMode(
-                            com.commercetools.api.models.customer.AuthenticationMode.findEnum("Password")) },
-                new Object[] { Customer.builder()
-                        .customerGroupAssignments(Collections.singletonList(
-                            new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl())) } };
+                new Object[] { "custom",
+                        Customer.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "locale", Customer.builder().locale("locale") },
+                new Object[] { "salutation", Customer.builder().salutation("salutation") },
+                new Object[] { "stores",
+                        Customer.builder()
+                                .stores(Collections.singletonList(
+                                    new com.commercetools.api.models.store.StoreKeyReferenceImpl())) },
+                new Object[] { "authenticationMode",
+                        Customer.builder()
+                                .authenticationMode(
+                                    com.commercetools.api.models.customer.AuthenticationMode.findEnum("Password")) },
+                new Object[] { "customerGroupAssignments",
+                        Customer.builder()
+                                .customerGroupAssignments(Collections.singletonList(
+                                    new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerTokenTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerTokenTest.java
index adda7b43b25..bdab48516ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerTokenTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerTokenTest.java
@@ -3,35 +3,30 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerTokenTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerTokenBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerTokenBuilder builder) {
         CustomerToken customerToken = builder.buildUnchecked();
         Assertions.assertThat(customerToken).isInstanceOf(CustomerToken.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerToken.builder().id("id") },
-                new Object[] { CustomerToken.builder().customerId("customerId") },
-                new Object[] { CustomerToken.builder().value("value") },
-                new Object[] { CustomerToken.builder().expiresAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CustomerToken.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CustomerToken.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+        return new Object[][] { new Object[] { "id", CustomerToken.builder().id("id") },
+                new Object[] { "customerId", CustomerToken.builder().customerId("customerId") },
+                new Object[] { "value", CustomerToken.builder().value("value") },
+                new Object[] { "expiresAt",
+                        CustomerToken.builder().expiresAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "createdAt",
+                        CustomerToken.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        CustomerToken.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerUpdateTest.java
index 3fba86b8cf8..bf31cf263e1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/CustomerUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerUpdateBuilder builder) {
         CustomerUpdate customerUpdate = builder.buildUnchecked();
         Assertions.assertThat(customerUpdate).isInstanceOf(CustomerUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerUpdate.builder().version(2L) },
-                new Object[] { CustomerUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.customer.CustomerUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", CustomerUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        CustomerUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.customer.CustomerUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerChangePasswordTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerChangePasswordTest.java
index 3a8ae0c4bf0..194ba3ebe4c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerChangePasswordTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerChangePasswordTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerChangePasswordTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerChangePasswordBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerChangePasswordBuilder builder) {
         MyCustomerChangePassword myCustomerChangePassword = builder.buildUnchecked();
         Assertions.assertThat(myCustomerChangePassword).isInstanceOf(MyCustomerChangePassword.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerChangePassword.builder().version(2L) },
-                new Object[] { MyCustomerChangePassword.builder().currentPassword("currentPassword") },
-                new Object[] { MyCustomerChangePassword.builder().newPassword("newPassword") } };
+        return new Object[][] { new Object[] { "version", MyCustomerChangePassword.builder().version(2L) },
+                new Object[] { "currentPassword",
+                        MyCustomerChangePassword.builder().currentPassword("currentPassword") },
+                new Object[] { "newPassword", MyCustomerChangePassword.builder().newPassword("newPassword") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerEmailVerifyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerEmailVerifyTest.java
index 8be55f76dc3..775390c90ad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerEmailVerifyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerEmailVerifyTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerEmailVerifyTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerEmailVerifyBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerEmailVerifyBuilder builder) {
         MyCustomerEmailVerify myCustomerEmailVerify = builder.buildUnchecked();
         Assertions.assertThat(myCustomerEmailVerify).isInstanceOf(MyCustomerEmailVerify.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerEmailVerify.builder().tokenValue("tokenValue") } };
+        return new Object[][] {
+                new Object[] { "tokenValue", MyCustomerEmailVerify.builder().tokenValue("tokenValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerResetPasswordTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerResetPasswordTest.java
index 5aa581748ac..a383d797d7b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerResetPasswordTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerResetPasswordTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerResetPasswordTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerResetPasswordBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerResetPasswordBuilder builder) {
         MyCustomerResetPassword myCustomerResetPassword = builder.buildUnchecked();
         Assertions.assertThat(myCustomerResetPassword).isInstanceOf(MyCustomerResetPassword.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerResetPassword.builder().tokenValue("tokenValue") },
-                new Object[] { MyCustomerResetPassword.builder().newPassword("newPassword") } };
+        return new Object[][] {
+                new Object[] { "tokenValue", MyCustomerResetPassword.builder().tokenValue("tokenValue") },
+                new Object[] { "newPassword", MyCustomerResetPassword.builder().newPassword("newPassword") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerSigninTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerSigninTest.java
index 29a7b087ae0..f991831a1ec 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerSigninTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer/MyCustomerSigninTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.customer;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSigninTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSigninBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSigninBuilder builder) {
         MyCustomerSignin myCustomerSignin = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSignin).isInstanceOf(MyCustomerSignin.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerSignin.builder().email("email") },
-                new Object[] { MyCustomerSignin.builder().password("password") },
-                new Object[] { MyCustomerSignin.builder()
-                        .activeCartSignInMode(com.commercetools.api.models.customer.AnonymousCartSignInMode
-                                .findEnum("MergeWithExistingCustomerCart")) },
-                new Object[] { MyCustomerSignin.builder().updateProductData(true) } };
+        return new Object[][] { new Object[] { "email", MyCustomerSignin.builder().email("email") },
+                new Object[] { "password", MyCustomerSignin.builder().password("password") },
+                new Object[] { "activeCartSignInMode",
+                        MyCustomerSignin.builder()
+                                .activeCartSignInMode(com.commercetools.api.models.customer.AnonymousCartSignInMode
+                                        .findEnum("MergeWithExistingCustomerCart")) },
+                new Object[] { "updateProductData", MyCustomerSignin.builder().updateProductData(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupChangeNameActionTest.java
index 9560d503513..378ba15ee7d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupChangeNameActionBuilder builder) {
         CustomerGroupChangeNameAction customerGroupChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(customerGroupChangeNameAction).isInstanceOf(CustomerGroupChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupChangeNameAction.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", CustomerGroupChangeNameAction.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupDraftTest.java
index 2fd6204ec18..3ce51d85222 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupDraftTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.customer_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupDraftBuilder builder) {
         CustomerGroupDraft customerGroupDraft = builder.buildUnchecked();
         Assertions.assertThat(customerGroupDraft).isInstanceOf(CustomerGroupDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupDraft.builder().key("key") },
-                new Object[] { CustomerGroupDraft.builder().groupName("groupName") },
-                new Object[] { CustomerGroupDraft.builder()
+        return new Object[][] { new Object[] { "key", CustomerGroupDraft.builder().key("key") },
+                new Object[] { "groupName", CustomerGroupDraft.builder().groupName("groupName") },
+                new Object[] { "custom", CustomerGroupDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupPagedQueryResponseTest.java
index 8f0dd5251e0..fc98e9b558d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupPagedQueryResponseBuilder builder) {
         CustomerGroupPagedQueryResponse customerGroupPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(customerGroupPagedQueryResponse).isInstanceOf(CustomerGroupPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupPagedQueryResponse.builder().limit(7L) },
-                new Object[] { CustomerGroupPagedQueryResponse.builder().offset(3L) },
-                new Object[] { CustomerGroupPagedQueryResponse.builder().count(2L) },
-                new Object[] { CustomerGroupPagedQueryResponse.builder().total(1L) },
-                new Object[] { CustomerGroupPagedQueryResponse.builder()
-                        .results(Collections.singletonList(
-                            new com.commercetools.api.models.customer_group.CustomerGroupImpl())) } };
+        return new Object[][] { new Object[] { "limit", CustomerGroupPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", CustomerGroupPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", CustomerGroupPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", CustomerGroupPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        CustomerGroupPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.customer_group.CustomerGroupImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupReferenceTest.java
index 7afd066fa83..cba38a4e8aa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.customer_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupReferenceBuilder builder) {
         CustomerGroupReference customerGroupReference = builder.buildUnchecked();
         Assertions.assertThat(customerGroupReference).isInstanceOf(CustomerGroupReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerGroupReference.builder()
-                        .obj(new com.commercetools.api.models.customer_group.CustomerGroupImpl()) },
-                new Object[] { CustomerGroupReference.builder().id("id") } };
+                new Object[] { "obj",
+                        CustomerGroupReference.builder()
+                                .obj(new com.commercetools.api.models.customer_group.CustomerGroupImpl()) },
+                new Object[] { "id", CustomerGroupReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupResourceIdentifierTest.java
index 11b94550bf2..85fc56eba4e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.customer_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupResourceIdentifierBuilder builder) {
         CustomerGroupResourceIdentifier customerGroupResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(customerGroupResourceIdentifier).isInstanceOf(CustomerGroupResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupResourceIdentifier.builder().id("id") },
-                new Object[] { CustomerGroupResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", CustomerGroupResourceIdentifier.builder().id("id") },
+                new Object[] { "key", CustomerGroupResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupSetCustomFieldActionTest.java
index 41792179968..922d71c6402 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.customer_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupSetCustomFieldActionBuilder builder) {
         CustomerGroupSetCustomFieldAction customerGroupSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(customerGroupSetCustomFieldAction).isInstanceOf(CustomerGroupSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupSetCustomFieldAction.builder().name("name") },
-                new Object[] { CustomerGroupSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", CustomerGroupSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", CustomerGroupSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupSetCustomTypeActionTest.java
index 55e43120616..d1cfb87fdeb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.customer_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupSetCustomTypeActionBuilder builder) {
         CustomerGroupSetCustomTypeAction customerGroupSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(customerGroupSetCustomTypeAction).isInstanceOf(CustomerGroupSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerGroupSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CustomerGroupSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        CustomerGroupSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CustomerGroupSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupSetKeyActionTest.java
index f7c4d48987f..2223b9fada2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.customer_group;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupSetKeyActionBuilder builder) {
         CustomerGroupSetKeyAction customerGroupSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(customerGroupSetKeyAction).isInstanceOf(CustomerGroupSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", CustomerGroupSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupTest.java
index c3ab2e0014b..778007eb90c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupTest.java
@@ -3,39 +3,34 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupBuilder builder) {
         CustomerGroup customerGroup = builder.buildUnchecked();
         Assertions.assertThat(customerGroup).isInstanceOf(CustomerGroup.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroup.builder().id("id") },
-                new Object[] { CustomerGroup.builder().version(2L) },
-                new Object[] { CustomerGroup.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CustomerGroup.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CustomerGroup.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", CustomerGroup.builder().id("id") },
+                new Object[] { "version", CustomerGroup.builder().version(2L) },
+                new Object[] { "createdAt",
+                        CustomerGroup.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        CustomerGroup.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        CustomerGroup.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         CustomerGroup.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { CustomerGroup.builder().key("key") },
-                new Object[] { CustomerGroup.builder().name("name") }, new Object[] {
+                new Object[] { "key", CustomerGroup.builder().key("key") },
+                new Object[] { "name", CustomerGroup.builder().name("name") }, new Object[] { "custom",
                         CustomerGroup.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupUpdateTest.java
index 42a5c810aae..895727e24d5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_group/CustomerGroupUpdateTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupUpdateBuilder builder) {
         CustomerGroupUpdate customerGroupUpdate = builder.buildUnchecked();
         Assertions.assertThat(customerGroupUpdate).isInstanceOf(CustomerGroupUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupUpdate.builder().version(2L) },
-                new Object[] { CustomerGroupUpdate.builder()
+        return new Object[][] { new Object[] { "version", CustomerGroupUpdate.builder().version(2L) },
+                new Object[] { "actions", CustomerGroupUpdate.builder()
                         .actions(Collections.singletonList(
                             new com.commercetools.api.models.customer_group.CustomerGroupUpdateActionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerIndexingProgressTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerIndexingProgressTest.java
index e74d6680622..528081aed7b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerIndexingProgressTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerIndexingProgressTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.customer_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerIndexingProgressTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerIndexingProgressBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerIndexingProgressBuilder builder) {
         CustomerIndexingProgress customerIndexingProgress = builder.buildUnchecked();
         Assertions.assertThat(customerIndexingProgress).isInstanceOf(CustomerIndexingProgress.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerIndexingProgress.builder().indexed(4) },
-                new Object[] { CustomerIndexingProgress.builder().failed(9) },
-                new Object[] { CustomerIndexingProgress.builder().estimatedTotal(9) } };
+        return new Object[][] { new Object[] { "indexed", CustomerIndexingProgress.builder().indexed(4) },
+                new Object[] { "failed", CustomerIndexingProgress.builder().failed(9) },
+                new Object[] { "estimatedTotal", CustomerIndexingProgress.builder().estimatedTotal(9) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerPagedSearchResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerPagedSearchResponseTest.java
index f8d84c309ef..7b655983b32 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerPagedSearchResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerPagedSearchResponseTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerPagedSearchResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerPagedSearchResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerPagedSearchResponseBuilder builder) {
         CustomerPagedSearchResponse customerPagedSearchResponse = builder.buildUnchecked();
         Assertions.assertThat(customerPagedSearchResponse).isInstanceOf(CustomerPagedSearchResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerPagedSearchResponse.builder().total(1L) },
-                new Object[] { CustomerPagedSearchResponse.builder().limit(7) },
-                new Object[] { CustomerPagedSearchResponse.builder().offset(3) },
-                new Object[] { CustomerPagedSearchResponse.builder()
-                        .results(Collections.singletonList(
-                            new com.commercetools.api.models.customer_search.CustomerSearchResultImpl())) } };
+        return new Object[][] { new Object[] { "total", CustomerPagedSearchResponse.builder().total(1L) },
+                new Object[] { "limit", CustomerPagedSearchResponse.builder().limit(7) },
+                new Object[] { "offset", CustomerPagedSearchResponse.builder().offset(3) },
+                new Object[] { "results",
+                        CustomerPagedSearchResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.customer_search.CustomerSearchResultImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerSearchIndexingStatusResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerSearchIndexingStatusResponseTest.java
index eb78b6e0779..24811fecf47 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerSearchIndexingStatusResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerSearchIndexingStatusResponseTest.java
@@ -3,40 +3,36 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSearchIndexingStatusResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSearchIndexingStatusResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSearchIndexingStatusResponseBuilder builder) {
         CustomerSearchIndexingStatusResponse customerSearchIndexingStatusResponse = builder.buildUnchecked();
         Assertions.assertThat(customerSearchIndexingStatusResponse)
                 .isInstanceOf(CustomerSearchIndexingStatusResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerSearchIndexingStatusResponse.builder()
-                        .status(com.commercetools.api.models.project.CustomerIndexingStatus.findEnum("Scheduled")) },
-                new Object[] { CustomerSearchIndexingStatusResponse.builder()
+                new Object[] { "status",
+                        CustomerSearchIndexingStatusResponse.builder()
+                                .status(com.commercetools.api.models.project.CustomerIndexingStatus
+                                        .findEnum("Scheduled")) },
+                new Object[] { "states", CustomerSearchIndexingStatusResponse.builder()
                         .states(new com.commercetools.api.models.customer_search.CustomerIndexingProgressImpl()) },
-                new Object[] { CustomerSearchIndexingStatusResponse.builder()
-                        .startedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CustomerSearchIndexingStatusResponse.builder()
-                        .lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CustomerSearchIndexingStatusResponse.builder().retryCount(7) } };
+                new Object[] { "startedAt",
+                        CustomerSearchIndexingStatusResponse.builder()
+                                .startedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        CustomerSearchIndexingStatusResponse.builder()
+                                .lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "retryCount", CustomerSearchIndexingStatusResponse.builder().retryCount(7) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerSearchRequestTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerSearchRequestTest.java
index 0d20ef52700..b0882c3f59c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerSearchRequestTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerSearchRequestTest.java
@@ -3,36 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSearchRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSearchRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSearchRequestBuilder builder) {
         CustomerSearchRequest customerSearchRequest = builder.buildUnchecked();
         Assertions.assertThat(customerSearchRequest).isInstanceOf(CustomerSearchRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerSearchRequest.builder()
-                        .query(new com.commercetools.api.models.search.SearchQueryImpl()) },
-                new Object[] { CustomerSearchRequest.builder()
-                        .sort(Collections.singletonList(new com.commercetools.api.models.search.SearchSortingImpl())) },
-                new Object[] { CustomerSearchRequest.builder().limit(7) },
-                new Object[] { CustomerSearchRequest.builder().offset(3) } };
+                new Object[] { "query",
+                        CustomerSearchRequest.builder()
+                                .query(new com.commercetools.api.models.search.SearchQueryImpl()) },
+                new Object[] { "sort",
+                        CustomerSearchRequest.builder()
+                                .sort(Collections
+                                        .singletonList(new com.commercetools.api.models.search.SearchSortingImpl())) },
+                new Object[] { "limit", CustomerSearchRequest.builder().limit(7) },
+                new Object[] { "offset", CustomerSearchRequest.builder().offset(3) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerSearchResultTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerSearchResultTest.java
index 5921fda2d14..46eb251a674 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerSearchResultTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/customer_search/CustomerSearchResultTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.customer_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerSearchResultTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerSearchResultBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerSearchResultBuilder builder) {
         CustomerSearchResult customerSearchResult = builder.buildUnchecked();
         Assertions.assertThat(customerSearchResult).isInstanceOf(CustomerSearchResult.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerSearchResult.builder().id("id") },
-                new Object[] { CustomerSearchResult.builder().relevance(0.5586561) } };
+        return new Object[][] { new Object[] { "id", CustomerSearchResult.builder().id("id") },
+                new Object[] { "relevance", CustomerSearchResult.builder().relevance(0.5586561) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeChangeCartDiscountsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeChangeCartDiscountsActionTest.java
index 49ed19de14b..4fa67f8a302 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeChangeCartDiscountsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeChangeCartDiscountsActionTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeChangeCartDiscountsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeChangeCartDiscountsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeChangeCartDiscountsActionBuilder builder) {
         DiscountCodeChangeCartDiscountsAction discountCodeChangeCartDiscountsAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeChangeCartDiscountsAction)
                 .isInstanceOf(DiscountCodeChangeCartDiscountsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeChangeCartDiscountsAction.builder()
-                .cartDiscounts(Collections.singletonList(
-                    new com.commercetools.api.models.cart_discount.CartDiscountResourceIdentifierImpl())) } };
+        return new Object[][] { new Object[] { "cartDiscounts",
+                DiscountCodeChangeCartDiscountsAction.builder()
+                        .cartDiscounts(Collections.singletonList(
+                            new com.commercetools.api.models.cart_discount.CartDiscountResourceIdentifierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeChangeGroupsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeChangeGroupsActionTest.java
index 3cf94a6ec5f..6b1461d7be7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeChangeGroupsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeChangeGroupsActionTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeChangeGroupsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeChangeGroupsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeChangeGroupsActionBuilder builder) {
         DiscountCodeChangeGroupsAction discountCodeChangeGroupsAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeChangeGroupsAction).isInstanceOf(DiscountCodeChangeGroupsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { DiscountCodeChangeGroupsAction.builder().groups(Collections.singletonList("groups")) } };
+        return new Object[][] { new Object[] { "groups",
+                DiscountCodeChangeGroupsAction.builder().groups(Collections.singletonList("groups")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeChangeIsActiveActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeChangeIsActiveActionTest.java
index e736bb813fb..90cf579d699 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeChangeIsActiveActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeChangeIsActiveActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.discount_code;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeChangeIsActiveActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeChangeIsActiveActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeChangeIsActiveActionBuilder builder) {
         DiscountCodeChangeIsActiveAction discountCodeChangeIsActiveAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeChangeIsActiveAction).isInstanceOf(DiscountCodeChangeIsActiveAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeChangeIsActiveAction.builder().isActive(true) } };
+        return new Object[][] {
+                new Object[] { "isActive", DiscountCodeChangeIsActiveAction.builder().isActive(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeDraftTest.java
index bcc65d47dec..d0b443a47ae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeDraftTest.java
@@ -4,47 +4,45 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeDraftBuilder builder) {
         DiscountCodeDraft discountCodeDraft = builder.buildUnchecked();
         Assertions.assertThat(discountCodeDraft).isInstanceOf(DiscountCodeDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeDraft.builder().key("key") },
-                new Object[] { DiscountCodeDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { DiscountCodeDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { DiscountCodeDraft.builder().code("code") },
-                new Object[] { DiscountCodeDraft.builder()
+        return new Object[][] { new Object[] { "key", DiscountCodeDraft.builder().key("key") },
+                new Object[] { "name",
+                        DiscountCodeDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
+                        DiscountCodeDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "code", DiscountCodeDraft.builder().code("code") },
+                new Object[] { "cartDiscounts", DiscountCodeDraft.builder()
                         .cartDiscounts(Collections.singletonList(
                             new com.commercetools.api.models.cart_discount.CartDiscountResourceIdentifierImpl())) },
-                new Object[] { DiscountCodeDraft.builder().cartPredicate("cartPredicate") },
-                new Object[] { DiscountCodeDraft.builder().isActive(true) },
-                new Object[] { DiscountCodeDraft.builder().maxApplications(9L) },
-                new Object[] { DiscountCodeDraft.builder().maxApplicationsPerCustomer(5L) },
-                new Object[] { DiscountCodeDraft.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { DiscountCodeDraft.builder().groups(Collections.singletonList("groups")) },
-                new Object[] { DiscountCodeDraft.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { DiscountCodeDraft.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "cartPredicate", DiscountCodeDraft.builder().cartPredicate("cartPredicate") },
+                new Object[] { "isActive", DiscountCodeDraft.builder().isActive(true) },
+                new Object[] { "maxApplications", DiscountCodeDraft.builder().maxApplications(9L) },
+                new Object[] { "maxApplicationsPerCustomer",
+                        DiscountCodeDraft.builder().maxApplicationsPerCustomer(5L) },
+                new Object[] { "custom",
+                        DiscountCodeDraft.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "groups", DiscountCodeDraft.builder().groups(Collections.singletonList("groups")) },
+                new Object[] { "validFrom",
+                        DiscountCodeDraft.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        DiscountCodeDraft.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodePagedQueryResponseTest.java
index 5528e91145b..fb977a63a80 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodePagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodePagedQueryResponseBuilder builder) {
         DiscountCodePagedQueryResponse discountCodePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(discountCodePagedQueryResponse).isInstanceOf(DiscountCodePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodePagedQueryResponse.builder().limit(7L) },
-                new Object[] { DiscountCodePagedQueryResponse.builder().offset(3L) },
-                new Object[] { DiscountCodePagedQueryResponse.builder().count(2L) },
-                new Object[] { DiscountCodePagedQueryResponse.builder().total(1L) },
-                new Object[] { DiscountCodePagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.discount_code.DiscountCodeImpl())) } };
+        return new Object[][] { new Object[] { "limit", DiscountCodePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", DiscountCodePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", DiscountCodePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", DiscountCodePagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        DiscountCodePagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.discount_code.DiscountCodeImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeReferenceTest.java
index f7556b4cd13..a515fe4f7ef 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.discount_code;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeReferenceBuilder builder) {
         DiscountCodeReference discountCodeReference = builder.buildUnchecked();
         Assertions.assertThat(discountCodeReference).isInstanceOf(DiscountCodeReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountCodeReference.builder()
-                        .obj(new com.commercetools.api.models.discount_code.DiscountCodeImpl()) },
-                new Object[] { DiscountCodeReference.builder().id("id") } };
+                new Object[] { "obj",
+                        DiscountCodeReference.builder()
+                                .obj(new com.commercetools.api.models.discount_code.DiscountCodeImpl()) },
+                new Object[] { "id", DiscountCodeReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeResourceIdentifierTest.java
index f90d12ef8af..5c8ee675bfa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.discount_code;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeResourceIdentifierBuilder builder) {
         DiscountCodeResourceIdentifier discountCodeResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(discountCodeResourceIdentifier).isInstanceOf(DiscountCodeResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeResourceIdentifier.builder().id("id") },
-                new Object[] { DiscountCodeResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", DiscountCodeResourceIdentifier.builder().id("id") },
+                new Object[] { "key", DiscountCodeResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetCartPredicateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetCartPredicateActionTest.java
index 0b87bb9efbc..9bbe51a24f7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetCartPredicateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetCartPredicateActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.discount_code;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeSetCartPredicateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeSetCartPredicateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeSetCartPredicateActionBuilder builder) {
         DiscountCodeSetCartPredicateAction discountCodeSetCartPredicateAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeSetCartPredicateAction)
                 .isInstanceOf(DiscountCodeSetCartPredicateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { DiscountCodeSetCartPredicateAction.builder().cartPredicate("cartPredicate") } };
+        return new Object[][] { new Object[] { "cartPredicate",
+                DiscountCodeSetCartPredicateAction.builder().cartPredicate("cartPredicate") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetCustomFieldActionTest.java
index 8967e2ddcf7..98114045bf7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.discount_code;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeSetCustomFieldActionBuilder builder) {
         DiscountCodeSetCustomFieldAction discountCodeSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeSetCustomFieldAction).isInstanceOf(DiscountCodeSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeSetCustomFieldAction.builder().name("name") },
-                new Object[] { DiscountCodeSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", DiscountCodeSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", DiscountCodeSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetCustomTypeActionTest.java
index f0c66302e5b..5a9755b7a5f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.discount_code;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeSetCustomTypeActionBuilder builder) {
         DiscountCodeSetCustomTypeAction discountCodeSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeSetCustomTypeAction).isInstanceOf(DiscountCodeSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountCodeSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { DiscountCodeSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        DiscountCodeSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", DiscountCodeSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetDescriptionActionTest.java
index 38b373b5d18..d1ab4a52484 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetDescriptionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.discount_code;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeSetDescriptionActionBuilder builder) {
         DiscountCodeSetDescriptionAction discountCodeSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeSetDescriptionAction).isInstanceOf(DiscountCodeSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeSetDescriptionAction.builder()
+        return new Object[][] { new Object[] { "description", DiscountCodeSetDescriptionAction.builder()
                 .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetKeyActionTest.java
index f0e84c875b8..f0dc2aa390b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.discount_code;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeSetKeyActionBuilder builder) {
         DiscountCodeSetKeyAction discountCodeSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeSetKeyAction).isInstanceOf(DiscountCodeSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", DiscountCodeSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetMaxApplicationsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetMaxApplicationsActionTest.java
index dfa610f09a5..006ac5117d7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetMaxApplicationsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetMaxApplicationsActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.discount_code;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeSetMaxApplicationsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeSetMaxApplicationsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeSetMaxApplicationsActionBuilder builder) {
         DiscountCodeSetMaxApplicationsAction discountCodeSetMaxApplicationsAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeSetMaxApplicationsAction)
                 .isInstanceOf(DiscountCodeSetMaxApplicationsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeSetMaxApplicationsAction.builder().maxApplications(9L) } };
+        return new Object[][] { new Object[] { "maxApplications",
+                DiscountCodeSetMaxApplicationsAction.builder().maxApplications(9L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetMaxApplicationsPerCustomerActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetMaxApplicationsPerCustomerActionTest.java
index 678a072a4ea..ed052322bbd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetMaxApplicationsPerCustomerActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetMaxApplicationsPerCustomerActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.discount_code;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeSetMaxApplicationsPerCustomerActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeSetMaxApplicationsPerCustomerActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeSetMaxApplicationsPerCustomerActionBuilder builder) {
         DiscountCodeSetMaxApplicationsPerCustomerAction discountCodeSetMaxApplicationsPerCustomerAction = builder
                 .buildUnchecked();
         Assertions.assertThat(discountCodeSetMaxApplicationsPerCustomerAction)
                 .isInstanceOf(DiscountCodeSetMaxApplicationsPerCustomerAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "maxApplicationsPerCustomer",
                 DiscountCodeSetMaxApplicationsPerCustomerAction.builder().maxApplicationsPerCustomer(5L) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetNameActionTest.java
index 05491a0c340..b3669590aaa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.discount_code;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeSetNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeSetNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeSetNameActionBuilder builder) {
         DiscountCodeSetNameAction discountCodeSetNameAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeSetNameAction).isInstanceOf(DiscountCodeSetNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeSetNameAction.builder()
+        return new Object[][] { new Object[] { "name", DiscountCodeSetNameAction.builder()
                 .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetValidFromActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetValidFromActionTest.java
index ae4ba4ef846..2011144dc79 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetValidFromActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetValidFromActionTest.java
@@ -3,30 +3,22 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeSetValidFromActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeSetValidFromActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeSetValidFromActionBuilder builder) {
         DiscountCodeSetValidFromAction discountCodeSetValidFromAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeSetValidFromAction).isInstanceOf(DiscountCodeSetValidFromAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "validFrom",
                 DiscountCodeSetValidFromAction.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetValidFromAndUntilActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetValidFromAndUntilActionTest.java
index f93fd3b312c..b355dd2cec6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetValidFromAndUntilActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetValidFromAndUntilActionTest.java
@@ -3,34 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeSetValidFromAndUntilActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeSetValidFromAndUntilActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeSetValidFromAndUntilActionBuilder builder) {
         DiscountCodeSetValidFromAndUntilAction discountCodeSetValidFromAndUntilAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeSetValidFromAndUntilAction)
                 .isInstanceOf(DiscountCodeSetValidFromAndUntilAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountCodeSetValidFromAndUntilAction.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { DiscountCodeSetValidFromAndUntilAction.builder()
+                new Object[] { "validFrom",
+                        DiscountCodeSetValidFromAndUntilAction.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil", DiscountCodeSetValidFromAndUntilAction.builder()
                         .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetValidUntilActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetValidUntilActionTest.java
index f02bf570caf..39410b50e5b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetValidUntilActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeSetValidUntilActionTest.java
@@ -3,30 +3,22 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeSetValidUntilActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeSetValidUntilActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeSetValidUntilActionBuilder builder) {
         DiscountCodeSetValidUntilAction discountCodeSetValidUntilAction = builder.buildUnchecked();
         Assertions.assertThat(discountCodeSetValidUntilAction).isInstanceOf(DiscountCodeSetValidUntilAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "validUntil",
                 DiscountCodeSetValidUntilAction.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeTest.java
index be6377a3b2b..1ea69d168ec 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeTest.java
@@ -4,59 +4,59 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeBuilder builder) {
         DiscountCode discountCode = builder.buildUnchecked();
         Assertions.assertThat(discountCode).isInstanceOf(DiscountCode.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCode.builder().id("id") },
-                new Object[] { DiscountCode.builder().key("key") }, new Object[] { DiscountCode.builder().version(2L) },
-                new Object[] { DiscountCode.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { DiscountCode.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { DiscountCode.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", DiscountCode.builder().id("id") },
+                new Object[] { "key", DiscountCode.builder().key("key") },
+                new Object[] { "version", DiscountCode.builder().version(2L) },
+                new Object[] { "createdAt",
+                        DiscountCode.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        DiscountCode.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        DiscountCode.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         DiscountCode.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] {
+                new Object[] { "name",
                         DiscountCode.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { DiscountCode.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { DiscountCode.builder().code("code") },
-                new Object[] { DiscountCode.builder()
-                        .cartDiscounts(Collections.singletonList(
-                            new com.commercetools.api.models.cart_discount.CartDiscountReferenceImpl())) },
-                new Object[] { DiscountCode.builder().cartPredicate("cartPredicate") },
-                new Object[] { DiscountCode.builder().isActive(true) },
-                new Object[] {
+                new Object[] { "description",
+                        DiscountCode.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "code", DiscountCode.builder().code("code") },
+                new Object[] { "cartDiscounts",
+                        DiscountCode.builder()
+                                .cartDiscounts(Collections.singletonList(
+                                    new com.commercetools.api.models.cart_discount.CartDiscountReferenceImpl())) },
+                new Object[] { "cartPredicate", DiscountCode.builder().cartPredicate("cartPredicate") },
+                new Object[] { "isActive", DiscountCode.builder().isActive(true) },
+                new Object[] { "references",
                         DiscountCode.builder()
                                 .references(Collections
                                         .singletonList(new com.commercetools.api.models.common.ReferenceImpl())) },
-                new Object[] { DiscountCode.builder().maxApplications(9L) },
-                new Object[] { DiscountCode.builder().maxApplicationsPerCustomer(5L) },
-                new Object[] {
+                new Object[] { "maxApplications", DiscountCode.builder().maxApplications(9L) },
+                new Object[] { "maxApplicationsPerCustomer", DiscountCode.builder().maxApplicationsPerCustomer(5L) },
+                new Object[] { "custom",
                         DiscountCode.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { DiscountCode.builder().groups(Collections.singletonList("groups")) },
-                new Object[] { DiscountCode.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { DiscountCode.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { DiscountCode.builder().applicationVersion(8L) } };
+                new Object[] { "groups", DiscountCode.builder().groups(Collections.singletonList("groups")) },
+                new Object[] { "validFrom",
+                        DiscountCode.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        DiscountCode.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "applicationVersion", DiscountCode.builder().applicationVersion(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeUpdateTest.java
index 165c724df49..4a196b8b232 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/discount_code/DiscountCodeUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeUpdateBuilder builder) {
         DiscountCodeUpdate discountCodeUpdate = builder.buildUnchecked();
         Assertions.assertThat(discountCodeUpdate).isInstanceOf(DiscountCodeUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeUpdate.builder().version(2L) },
-                new Object[] { DiscountCodeUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.discount_code.DiscountCodeUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", DiscountCodeUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        DiscountCodeUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.discount_code.DiscountCodeUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AnonymousIdAlreadyInUseErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AnonymousIdAlreadyInUseErrorTest.java
index 9b74054e8f1..ac0d062b6a7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AnonymousIdAlreadyInUseErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AnonymousIdAlreadyInUseErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AnonymousIdAlreadyInUseErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AnonymousIdAlreadyInUseErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AnonymousIdAlreadyInUseErrorBuilder builder) {
         AnonymousIdAlreadyInUseError anonymousIdAlreadyInUseError = builder.buildUnchecked();
         Assertions.assertThat(anonymousIdAlreadyInUseError).isInstanceOf(AnonymousIdAlreadyInUseError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AnonymousIdAlreadyInUseError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", AnonymousIdAlreadyInUseError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AssociateMissingPermissionErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AssociateMissingPermissionErrorTest.java
index 44095886c10..256ea9cb14c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AssociateMissingPermissionErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AssociateMissingPermissionErrorTest.java
@@ -3,39 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateMissingPermissionErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateMissingPermissionErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateMissingPermissionErrorBuilder builder) {
         AssociateMissingPermissionError associateMissingPermissionError = builder.buildUnchecked();
         Assertions.assertThat(associateMissingPermissionError).isInstanceOf(AssociateMissingPermissionError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateMissingPermissionError.builder().message("message") },
-                new Object[] { AssociateMissingPermissionError.builder()
+        return new Object[][] {
+                new Object[] { "message", AssociateMissingPermissionError.builder().message("message") },
+                new Object[] { "associate", AssociateMissingPermissionError.builder()
                         .associate(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) },
-                new Object[] { AssociateMissingPermissionError.builder()
+                new Object[] { "businessUnit", AssociateMissingPermissionError.builder()
                         .businessUnit(
                             new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) },
-                new Object[] { AssociateMissingPermissionError.builder()
-                        .associateOnBehalf(
-                            new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) },
-                new Object[] { AssociateMissingPermissionError.builder()
+                new Object[] { "associateOnBehalf",
+                        AssociateMissingPermissionError.builder()
+                                .associateOnBehalf(
+                                    new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) },
+                new Object[] { "permissions", AssociateMissingPermissionError.builder()
                         .permissions(Collections.singletonList(
                             com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits"))) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AttributeDefinitionAlreadyExistsErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AttributeDefinitionAlreadyExistsErrorTest.java
index 79ce8c291d8..8ffa252dbb8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AttributeDefinitionAlreadyExistsErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AttributeDefinitionAlreadyExistsErrorTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeDefinitionAlreadyExistsErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeDefinitionAlreadyExistsErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeDefinitionAlreadyExistsErrorBuilder builder) {
         AttributeDefinitionAlreadyExistsError attributeDefinitionAlreadyExistsError = builder.buildUnchecked();
         Assertions.assertThat(attributeDefinitionAlreadyExistsError)
                 .isInstanceOf(AttributeDefinitionAlreadyExistsError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeDefinitionAlreadyExistsError.builder().message("message") },
-                new Object[] { AttributeDefinitionAlreadyExistsError.builder()
-                        .conflictingProductTypeId("conflictingProductTypeId") },
-                new Object[] { AttributeDefinitionAlreadyExistsError.builder()
-                        .conflictingProductTypeName("conflictingProductTypeName") },
-                new Object[] { AttributeDefinitionAlreadyExistsError.builder()
+        return new Object[][] {
+                new Object[] { "message", AttributeDefinitionAlreadyExistsError.builder().message("message") },
+                new Object[] { "conflictingProductTypeId",
+                        AttributeDefinitionAlreadyExistsError.builder()
+                                .conflictingProductTypeId("conflictingProductTypeId") },
+                new Object[] { "conflictingProductTypeName",
+                        AttributeDefinitionAlreadyExistsError.builder()
+                                .conflictingProductTypeName("conflictingProductTypeName") },
+                new Object[] { "conflictingAttributeName", AttributeDefinitionAlreadyExistsError.builder()
                         .conflictingAttributeName("conflictingAttributeName") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AttributeDefinitionTypeConflictErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AttributeDefinitionTypeConflictErrorTest.java
index d594572b45b..2595d385619 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AttributeDefinitionTypeConflictErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AttributeDefinitionTypeConflictErrorTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeDefinitionTypeConflictErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeDefinitionTypeConflictErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeDefinitionTypeConflictErrorBuilder builder) {
         AttributeDefinitionTypeConflictError attributeDefinitionTypeConflictError = builder.buildUnchecked();
         Assertions.assertThat(attributeDefinitionTypeConflictError)
                 .isInstanceOf(AttributeDefinitionTypeConflictError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeDefinitionTypeConflictError.builder().message("message") },
-                new Object[] { AttributeDefinitionTypeConflictError.builder()
-                        .conflictingProductTypeId("conflictingProductTypeId") },
-                new Object[] { AttributeDefinitionTypeConflictError.builder()
-                        .conflictingProductTypeName("conflictingProductTypeName") },
-                new Object[] { AttributeDefinitionTypeConflictError.builder()
+        return new Object[][] {
+                new Object[] { "message", AttributeDefinitionTypeConflictError.builder().message("message") },
+                new Object[] { "conflictingProductTypeId",
+                        AttributeDefinitionTypeConflictError.builder()
+                                .conflictingProductTypeId("conflictingProductTypeId") },
+                new Object[] { "conflictingProductTypeName",
+                        AttributeDefinitionTypeConflictError.builder()
+                                .conflictingProductTypeName("conflictingProductTypeName") },
+                new Object[] { "conflictingAttributeName", AttributeDefinitionTypeConflictError.builder()
                         .conflictingAttributeName("conflictingAttributeName") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AttributeNameDoesNotExistErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AttributeNameDoesNotExistErrorTest.java
index a610e395d48..d7340e6c304 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AttributeNameDoesNotExistErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AttributeNameDoesNotExistErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeNameDoesNotExistErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeNameDoesNotExistErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeNameDoesNotExistErrorBuilder builder) {
         AttributeNameDoesNotExistError attributeNameDoesNotExistError = builder.buildUnchecked();
         Assertions.assertThat(attributeNameDoesNotExistError).isInstanceOf(AttributeNameDoesNotExistError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeNameDoesNotExistError.builder().message("message") },
-                new Object[] {
+        return new Object[][] { new Object[] { "message", AttributeNameDoesNotExistError.builder().message("message") },
+                new Object[] { "invalidAttributeName",
                         AttributeNameDoesNotExistError.builder().invalidAttributeName("invalidAttributeName") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AuthErrorResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AuthErrorResponseTest.java
index 6e1489983e8..0ce38057d54 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AuthErrorResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/AuthErrorResponseTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AuthErrorResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AuthErrorResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AuthErrorResponseBuilder builder) {
         AuthErrorResponse authErrorResponse = builder.buildUnchecked();
         Assertions.assertThat(authErrorResponse).isInstanceOf(AuthErrorResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AuthErrorResponse.builder().error("error") },
-                new Object[] { AuthErrorResponse.builder().error_description("error_description") },
-                new Object[] { AuthErrorResponse.builder()
+        return new Object[][] { new Object[] { "error", AuthErrorResponse.builder().error("error") },
+                new Object[] { "error_description",
+                        AuthErrorResponse.builder().error_description("error_description") },
+                new Object[] { "errors", AuthErrorResponse.builder()
                         .errors(
                             Collections.singletonList(new com.commercetools.api.models.error.ErrorObjectImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/BadGatewayErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/BadGatewayErrorTest.java
index 8528767c8ed..32d37d2d2b0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/BadGatewayErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/BadGatewayErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BadGatewayErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BadGatewayErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BadGatewayErrorBuilder builder) {
         BadGatewayError badGatewayError = builder.buildUnchecked();
         Assertions.assertThat(badGatewayError).isInstanceOf(BadGatewayError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BadGatewayError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", BadGatewayError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ConcurrentModificationErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ConcurrentModificationErrorTest.java
index 5b683df1637..139d85777c3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ConcurrentModificationErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ConcurrentModificationErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ConcurrentModificationErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ConcurrentModificationErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ConcurrentModificationErrorBuilder builder) {
         ConcurrentModificationError concurrentModificationError = builder.buildUnchecked();
         Assertions.assertThat(concurrentModificationError).isInstanceOf(ConcurrentModificationError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ConcurrentModificationError.builder().message("message") },
-                new Object[] { ConcurrentModificationError.builder().currentVersion(4L) } };
+        return new Object[][] { new Object[] { "message", ConcurrentModificationError.builder().message("message") },
+                new Object[] { "currentVersion", ConcurrentModificationError.builder().currentVersion(4L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ContentTooLargeErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ContentTooLargeErrorTest.java
index e94a0ca6c40..b32c7436ade 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ContentTooLargeErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ContentTooLargeErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ContentTooLargeErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ContentTooLargeErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ContentTooLargeErrorBuilder builder) {
         ContentTooLargeError contentTooLargeError = builder.buildUnchecked();
         Assertions.assertThat(contentTooLargeError).isInstanceOf(ContentTooLargeError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ContentTooLargeError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", ContentTooLargeError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/CountryNotConfiguredInStoreErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/CountryNotConfiguredInStoreErrorTest.java
index 5f0e484b76e..79ee4df646e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/CountryNotConfiguredInStoreErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/CountryNotConfiguredInStoreErrorTest.java
@@ -3,33 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CountryNotConfiguredInStoreErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CountryNotConfiguredInStoreErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CountryNotConfiguredInStoreErrorBuilder builder) {
         CountryNotConfiguredInStoreError countryNotConfiguredInStoreError = builder.buildUnchecked();
         Assertions.assertThat(countryNotConfiguredInStoreError).isInstanceOf(CountryNotConfiguredInStoreError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CountryNotConfiguredInStoreError.builder().message("message") },
-                new Object[] { CountryNotConfiguredInStoreError.builder()
-                        .storeCountries(Collections.singletonList("storeCountries")) },
-                new Object[] { CountryNotConfiguredInStoreError.builder().country("country") } };
+        return new Object[][] {
+                new Object[] { "message", CountryNotConfiguredInStoreError.builder().message("message") },
+                new Object[] { "storeCountries",
+                        CountryNotConfiguredInStoreError.builder()
+                                .storeCountries(Collections.singletonList("storeCountries")) },
+                new Object[] { "country", CountryNotConfiguredInStoreError.builder().country("country") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DiscountCodeNonApplicableErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DiscountCodeNonApplicableErrorTest.java
index b42d2f461bb..ae9504a04fb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DiscountCodeNonApplicableErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DiscountCodeNonApplicableErrorTest.java
@@ -3,38 +3,31 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeNonApplicableErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeNonApplicableErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeNonApplicableErrorBuilder builder) {
         DiscountCodeNonApplicableError discountCodeNonApplicableError = builder.buildUnchecked();
         Assertions.assertThat(discountCodeNonApplicableError).isInstanceOf(DiscountCodeNonApplicableError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeNonApplicableError.builder().message("message") },
-                new Object[] { DiscountCodeNonApplicableError.builder().discountCode("discountCode") },
-                new Object[] { DiscountCodeNonApplicableError.builder().reason("reason") },
-                new Object[] { DiscountCodeNonApplicableError.builder().discountCodeId("discountCodeId") },
-                new Object[] {
+        return new Object[][] { new Object[] { "message", DiscountCodeNonApplicableError.builder().message("message") },
+                new Object[] { "discountCode", DiscountCodeNonApplicableError.builder().discountCode("discountCode") },
+                new Object[] { "reason", DiscountCodeNonApplicableError.builder().reason("reason") },
+                new Object[] { "discountCodeId",
+                        DiscountCodeNonApplicableError.builder().discountCodeId("discountCodeId") },
+                new Object[] { "validFrom",
                         DiscountCodeNonApplicableError.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+                new Object[] { "validUntil",
                         DiscountCodeNonApplicableError.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { DiscountCodeNonApplicableError.builder()
+                new Object[] { "validityCheckTime", DiscountCodeNonApplicableError.builder()
                         .validityCheckTime(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateAttributeValueErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateAttributeValueErrorTest.java
index dd1ce25b278..6a477b9a44b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateAttributeValueErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateAttributeValueErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicateAttributeValueErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicateAttributeValueErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicateAttributeValueErrorBuilder builder) {
         DuplicateAttributeValueError duplicateAttributeValueError = builder.buildUnchecked();
         Assertions.assertThat(duplicateAttributeValueError).isInstanceOf(DuplicateAttributeValueError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DuplicateAttributeValueError.builder().message("message") },
-                new Object[] { DuplicateAttributeValueError.builder()
+        return new Object[][] { new Object[] { "message", DuplicateAttributeValueError.builder().message("message") },
+                new Object[] { "attribute", DuplicateAttributeValueError.builder()
                         .attribute(new com.commercetools.api.models.product.AttributeImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateAttributeValuesErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateAttributeValuesErrorTest.java
index f4ca7c075ad..431d9a8fd4b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateAttributeValuesErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateAttributeValuesErrorTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicateAttributeValuesErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicateAttributeValuesErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicateAttributeValuesErrorBuilder builder) {
         DuplicateAttributeValuesError duplicateAttributeValuesError = builder.buildUnchecked();
         Assertions.assertThat(duplicateAttributeValuesError).isInstanceOf(DuplicateAttributeValuesError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DuplicateAttributeValuesError.builder().message("message") },
-                new Object[] { DuplicateAttributeValuesError.builder()
+        return new Object[][] { new Object[] { "message", DuplicateAttributeValuesError.builder().message("message") },
+                new Object[] { "attributes", DuplicateAttributeValuesError.builder()
                         .attributes(
                             Collections.singletonList(new com.commercetools.api.models.product.AttributeImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateEnumValuesErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateEnumValuesErrorTest.java
index fce6bce8778..54e2fc98955 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateEnumValuesErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateEnumValuesErrorTest.java
@@ -3,31 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicateEnumValuesErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicateEnumValuesErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicateEnumValuesErrorBuilder builder) {
         DuplicateEnumValuesError duplicateEnumValuesError = builder.buildUnchecked();
         Assertions.assertThat(duplicateEnumValuesError).isInstanceOf(DuplicateEnumValuesError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DuplicateEnumValuesError.builder().message("message") }, new Object[] {
-                DuplicateEnumValuesError.builder().duplicates(Collections.singletonList("duplicates")) } };
+        return new Object[][] { new Object[] { "message", DuplicateEnumValuesError.builder().message("message") },
+                new Object[] { "duplicates",
+                        DuplicateEnumValuesError.builder().duplicates(Collections.singletonList("duplicates")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateFieldErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateFieldErrorTest.java
index 6692a9aeb3e..f28d6d8cbff 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateFieldErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateFieldErrorTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicateFieldErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicateFieldErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicateFieldErrorBuilder builder) {
         DuplicateFieldError duplicateFieldError = builder.buildUnchecked();
         Assertions.assertThat(duplicateFieldError).isInstanceOf(DuplicateFieldError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DuplicateFieldError.builder().message("message") },
-                new Object[] { DuplicateFieldError.builder().field("field") },
-                new Object[] { DuplicateFieldError.builder().duplicateValue("duplicateValue") } };
+        return new Object[][] { new Object[] { "message", DuplicateFieldError.builder().message("message") },
+                new Object[] { "field", DuplicateFieldError.builder().field("field") },
+                new Object[] { "duplicateValue", DuplicateFieldError.builder().duplicateValue("duplicateValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateFieldWithConflictingResourceErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateFieldWithConflictingResourceErrorTest.java
index a0815ae4fc8..75afb69bfc0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateFieldWithConflictingResourceErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateFieldWithConflictingResourceErrorTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicateFieldWithConflictingResourceErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicateFieldWithConflictingResourceErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicateFieldWithConflictingResourceErrorBuilder builder) {
         DuplicateFieldWithConflictingResourceError duplicateFieldWithConflictingResourceError = builder
                 .buildUnchecked();
         Assertions.assertThat(duplicateFieldWithConflictingResourceError)
                 .isInstanceOf(DuplicateFieldWithConflictingResourceError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DuplicateFieldWithConflictingResourceError.builder().message("message") },
-                new Object[] { DuplicateFieldWithConflictingResourceError.builder().field("field") },
-                new Object[] { DuplicateFieldWithConflictingResourceError.builder().duplicateValue("duplicateValue") },
-                new Object[] { DuplicateFieldWithConflictingResourceError.builder()
+                new Object[] { "message", DuplicateFieldWithConflictingResourceError.builder().message("message") },
+                new Object[] { "field", DuplicateFieldWithConflictingResourceError.builder().field("field") },
+                new Object[] { "duplicateValue",
+                        DuplicateFieldWithConflictingResourceError.builder().duplicateValue("duplicateValue") },
+                new Object[] { "conflictingResource", DuplicateFieldWithConflictingResourceError.builder()
                         .conflictingResource(new com.commercetools.api.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicatePriceKeyErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicatePriceKeyErrorTest.java
index 6680eca6520..098f629c5b2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicatePriceKeyErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicatePriceKeyErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicatePriceKeyErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicatePriceKeyErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicatePriceKeyErrorBuilder builder) {
         DuplicatePriceKeyError duplicatePriceKeyError = builder.buildUnchecked();
         Assertions.assertThat(duplicatePriceKeyError).isInstanceOf(DuplicatePriceKeyError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DuplicatePriceKeyError.builder().message("message") },
-                new Object[] { DuplicatePriceKeyError.builder()
+        return new Object[][] { new Object[] { "message", DuplicatePriceKeyError.builder().message("message") },
+                new Object[] { "conflictingPrice", DuplicatePriceKeyError.builder()
                         .conflictingPrice(new com.commercetools.api.models.common.PriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicatePriceScopeErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicatePriceScopeErrorTest.java
index 0a00adbd1c9..44efdbf113e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicatePriceScopeErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicatePriceScopeErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicatePriceScopeErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicatePriceScopeErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicatePriceScopeErrorBuilder builder) {
         DuplicatePriceScopeError duplicatePriceScopeError = builder.buildUnchecked();
         Assertions.assertThat(duplicatePriceScopeError).isInstanceOf(DuplicatePriceScopeError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DuplicatePriceScopeError.builder().message("message") },
-                new Object[] { DuplicatePriceScopeError.builder()
+        return new Object[][] { new Object[] { "message", DuplicatePriceScopeError.builder().message("message") },
+                new Object[] { "conflictingPrice", DuplicatePriceScopeError.builder()
                         .conflictingPrice(new com.commercetools.api.models.common.PriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateStandalonePriceScopeErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateStandalonePriceScopeErrorTest.java
index dbd1e634825..1386634036e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateStandalonePriceScopeErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateStandalonePriceScopeErrorTest.java
@@ -3,45 +3,41 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicateStandalonePriceScopeErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicateStandalonePriceScopeErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicateStandalonePriceScopeErrorBuilder builder) {
         DuplicateStandalonePriceScopeError duplicateStandalonePriceScopeError = builder.buildUnchecked();
         Assertions.assertThat(duplicateStandalonePriceScopeError)
                 .isInstanceOf(DuplicateStandalonePriceScopeError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DuplicateStandalonePriceScopeError.builder().message("message") },
-                new Object[] { DuplicateStandalonePriceScopeError.builder()
-                        .conflictingStandalonePrice(
-                            new com.commercetools.api.models.standalone_price.StandalonePriceReferenceImpl()) },
-                new Object[] { DuplicateStandalonePriceScopeError.builder().sku("sku") },
-                new Object[] { DuplicateStandalonePriceScopeError.builder().currency("currency") },
-                new Object[] { DuplicateStandalonePriceScopeError.builder().country("country") },
-                new Object[] { DuplicateStandalonePriceScopeError.builder()
+        return new Object[][] {
+                new Object[] { "message", DuplicateStandalonePriceScopeError.builder().message("message") },
+                new Object[] { "conflictingStandalonePrice",
+                        DuplicateStandalonePriceScopeError.builder()
+                                .conflictingStandalonePrice(
+                                    new com.commercetools.api.models.standalone_price.StandalonePriceReferenceImpl()) },
+                new Object[] { "sku", DuplicateStandalonePriceScopeError.builder().sku("sku") },
+                new Object[] { "currency", DuplicateStandalonePriceScopeError.builder().currency("currency") },
+                new Object[] { "country", DuplicateStandalonePriceScopeError.builder().country("country") },
+                new Object[] { "customerGroup", DuplicateStandalonePriceScopeError.builder()
                         .customerGroup(
                             new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) },
-                new Object[] { DuplicateStandalonePriceScopeError.builder()
-                        .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { DuplicateStandalonePriceScopeError.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { DuplicateStandalonePriceScopeError.builder()
+                new Object[] { "channel",
+                        DuplicateStandalonePriceScopeError.builder()
+                                .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "validFrom",
+                        DuplicateStandalonePriceScopeError.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil", DuplicateStandalonePriceScopeError.builder()
                         .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateVariantValuesErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateVariantValuesErrorTest.java
index 785cc415152..72d724b5c08 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateVariantValuesErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/DuplicateVariantValuesErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicateVariantValuesErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicateVariantValuesErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicateVariantValuesErrorBuilder builder) {
         DuplicateVariantValuesError duplicateVariantValuesError = builder.buildUnchecked();
         Assertions.assertThat(duplicateVariantValuesError).isInstanceOf(DuplicateVariantValuesError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DuplicateVariantValuesError.builder().message("message") },
-                new Object[] { DuplicateVariantValuesError.builder()
+        return new Object[][] { new Object[] { "message", DuplicateVariantValuesError.builder().message("message") },
+                new Object[] { "variantValues", DuplicateVariantValuesError.builder()
                         .variantValues(new com.commercetools.api.models.error.VariantValuesImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EditPreviewFailedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EditPreviewFailedErrorTest.java
index ad5f7ee0be3..832ba6b5582 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EditPreviewFailedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EditPreviewFailedErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EditPreviewFailedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EditPreviewFailedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EditPreviewFailedErrorBuilder builder) {
         EditPreviewFailedError editPreviewFailedError = builder.buildUnchecked();
         Assertions.assertThat(editPreviewFailedError).isInstanceOf(EditPreviewFailedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EditPreviewFailedError.builder().message("message") },
-                new Object[] { EditPreviewFailedError.builder()
+        return new Object[][] { new Object[] { "message", EditPreviewFailedError.builder().message("message") },
+                new Object[] { "result", EditPreviewFailedError.builder()
                         .result(new com.commercetools.api.models.order_edit.OrderEditPreviewFailureImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumKeyAlreadyExistsErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumKeyAlreadyExistsErrorTest.java
index a0eb195e6d1..a93902c6516 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumKeyAlreadyExistsErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumKeyAlreadyExistsErrorTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EnumKeyAlreadyExistsErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EnumKeyAlreadyExistsErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EnumKeyAlreadyExistsErrorBuilder builder) {
         EnumKeyAlreadyExistsError enumKeyAlreadyExistsError = builder.buildUnchecked();
         Assertions.assertThat(enumKeyAlreadyExistsError).isInstanceOf(EnumKeyAlreadyExistsError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EnumKeyAlreadyExistsError.builder().message("message") },
-                new Object[] { EnumKeyAlreadyExistsError.builder().conflictingEnumKey("conflictingEnumKey") },
-                new Object[] {
+        return new Object[][] { new Object[] { "message", EnumKeyAlreadyExistsError.builder().message("message") },
+                new Object[] { "conflictingEnumKey",
+                        EnumKeyAlreadyExistsError.builder().conflictingEnumKey("conflictingEnumKey") },
+                new Object[] { "conflictingAttributeName",
                         EnumKeyAlreadyExistsError.builder().conflictingAttributeName("conflictingAttributeName") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumKeyDoesNotExistErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumKeyDoesNotExistErrorTest.java
index 5e379f6bc81..9ace940d659 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumKeyDoesNotExistErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumKeyDoesNotExistErrorTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EnumKeyDoesNotExistErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EnumKeyDoesNotExistErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EnumKeyDoesNotExistErrorBuilder builder) {
         EnumKeyDoesNotExistError enumKeyDoesNotExistError = builder.buildUnchecked();
         Assertions.assertThat(enumKeyDoesNotExistError).isInstanceOf(EnumKeyDoesNotExistError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EnumKeyDoesNotExistError.builder().message("message") },
-                new Object[] { EnumKeyDoesNotExistError.builder().conflictingEnumKey("conflictingEnumKey") },
-                new Object[] {
+        return new Object[][] { new Object[] { "message", EnumKeyDoesNotExistError.builder().message("message") },
+                new Object[] { "conflictingEnumKey",
+                        EnumKeyDoesNotExistError.builder().conflictingEnumKey("conflictingEnumKey") },
+                new Object[] { "conflictingAttributeName",
                         EnumKeyDoesNotExistError.builder().conflictingAttributeName("conflictingAttributeName") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumValueIsUsedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumValueIsUsedErrorTest.java
index b6f7f012663..bf3f8ac552b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumValueIsUsedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumValueIsUsedErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EnumValueIsUsedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EnumValueIsUsedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EnumValueIsUsedErrorBuilder builder) {
         EnumValueIsUsedError enumValueIsUsedError = builder.buildUnchecked();
         Assertions.assertThat(enumValueIsUsedError).isInstanceOf(EnumValueIsUsedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EnumValueIsUsedError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", EnumValueIsUsedError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumValuesMustMatchErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumValuesMustMatchErrorTest.java
index 3d651fac38a..1a18c5b17b5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumValuesMustMatchErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/EnumValuesMustMatchErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EnumValuesMustMatchErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EnumValuesMustMatchErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EnumValuesMustMatchErrorBuilder builder) {
         EnumValuesMustMatchError enumValuesMustMatchError = builder.buildUnchecked();
         Assertions.assertThat(enumValuesMustMatchError).isInstanceOf(EnumValuesMustMatchError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EnumValuesMustMatchError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", EnumValuesMustMatchError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ErrorByExtensionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ErrorByExtensionTest.java
index f869b80584e..f06c73169f7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ErrorByExtensionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ErrorByExtensionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ErrorByExtensionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ErrorByExtensionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ErrorByExtensionBuilder builder) {
         ErrorByExtension errorByExtension = builder.buildUnchecked();
         Assertions.assertThat(errorByExtension).isInstanceOf(ErrorByExtension.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ErrorByExtension.builder().id("id") },
-                new Object[] { ErrorByExtension.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", ErrorByExtension.builder().id("id") },
+                new Object[] { "key", ErrorByExtension.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ErrorResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ErrorResponseTest.java
index abd697997fb..0f2e97b796e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ErrorResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ErrorResponseTest.java
@@ -3,32 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ErrorResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ErrorResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ErrorResponseBuilder builder) {
         ErrorResponse errorResponse = builder.buildUnchecked();
         Assertions.assertThat(errorResponse).isInstanceOf(ErrorResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ErrorResponse.builder().statusCode(8) },
-                new Object[] { ErrorResponse.builder().message("message") },
-                new Object[] { ErrorResponse.builder()
+        return new Object[][] { new Object[] { "statusCode", ErrorResponse.builder().statusCode(8) },
+                new Object[] { "message", ErrorResponse.builder().message("message") },
+                new Object[] { "errors", ErrorResponse.builder()
                         .errors(
                             Collections.singletonList(new com.commercetools.api.models.error.ErrorObjectImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionBadResponseErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionBadResponseErrorTest.java
index 85ebb82cda8..a06de51ddf7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionBadResponseErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionBadResponseErrorTest.java
@@ -3,41 +3,35 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionBadResponseErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionBadResponseErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionBadResponseErrorBuilder builder) {
         ExtensionBadResponseError extensionBadResponseError = builder.buildUnchecked();
         Assertions.assertThat(extensionBadResponseError).isInstanceOf(ExtensionBadResponseError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionBadResponseError.builder().message("message") },
-                new Object[] { ExtensionBadResponseError.builder()
-                        .localizedMessage(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ExtensionBadResponseError.builder().extensionExtraInfo("extensionExtraInfo") },
-                new Object[] {
+        return new Object[][] { new Object[] { "message", ExtensionBadResponseError.builder().message("message") },
+                new Object[] { "localizedMessage",
+                        ExtensionBadResponseError.builder()
+                                .localizedMessage(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "extensionExtraInfo",
+                        ExtensionBadResponseError.builder().extensionExtraInfo("extensionExtraInfo") },
+                new Object[] { "extensionErrors",
                         ExtensionBadResponseError.builder()
                                 .extensionErrors(Collections
                                         .singletonList(new com.commercetools.api.models.error.ExtensionErrorImpl())) },
-                new Object[] { ExtensionBadResponseError.builder().extensionBody("extensionBody") },
-                new Object[] { ExtensionBadResponseError.builder().extensionStatusCode(3) },
-                new Object[] { ExtensionBadResponseError.builder().extensionId("extensionId") },
-                new Object[] { ExtensionBadResponseError.builder().extensionKey("extensionKey") } };
+                new Object[] { "extensionBody", ExtensionBadResponseError.builder().extensionBody("extensionBody") },
+                new Object[] { "extensionStatusCode", ExtensionBadResponseError.builder().extensionStatusCode(3) },
+                new Object[] { "extensionId", ExtensionBadResponseError.builder().extensionId("extensionId") },
+                new Object[] { "extensionKey", ExtensionBadResponseError.builder().extensionKey("extensionKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionErrorTest.java
index 4059f0a0f15..71c43624c92 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionErrorTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionErrorBuilder builder) {
         ExtensionError extensionError = builder.buildUnchecked();
         Assertions.assertThat(extensionError).isInstanceOf(ExtensionError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionError.builder().code("code") },
-                new Object[] { ExtensionError.builder().message("message") },
-                new Object[] { ExtensionError.builder().extensionId("extensionId") },
-                new Object[] { ExtensionError.builder().extensionKey("extensionKey") } };
+        return new Object[][] { new Object[] { "code", ExtensionError.builder().code("code") },
+                new Object[] { "message", ExtensionError.builder().message("message") },
+                new Object[] { "extensionId", ExtensionError.builder().extensionId("extensionId") },
+                new Object[] { "extensionKey", ExtensionError.builder().extensionKey("extensionKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionNoResponseErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionNoResponseErrorTest.java
index 87b7b8e73eb..aee1bf5a662 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionNoResponseErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionNoResponseErrorTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionNoResponseErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionNoResponseErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionNoResponseErrorBuilder builder) {
         ExtensionNoResponseError extensionNoResponseError = builder.buildUnchecked();
         Assertions.assertThat(extensionNoResponseError).isInstanceOf(ExtensionNoResponseError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionNoResponseError.builder().message("message") },
-                new Object[] { ExtensionNoResponseError.builder().extensionId("extensionId") },
-                new Object[] { ExtensionNoResponseError.builder().extensionKey("extensionKey") } };
+        return new Object[][] { new Object[] { "message", ExtensionNoResponseError.builder().message("message") },
+                new Object[] { "extensionId", ExtensionNoResponseError.builder().extensionId("extensionId") },
+                new Object[] { "extensionKey", ExtensionNoResponseError.builder().extensionKey("extensionKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionPredicateEvaluationFailedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionPredicateEvaluationFailedErrorTest.java
index 466c8eb6b96..af0794244f0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionPredicateEvaluationFailedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionPredicateEvaluationFailedErrorTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionPredicateEvaluationFailedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionPredicateEvaluationFailedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionPredicateEvaluationFailedErrorBuilder builder) {
         ExtensionPredicateEvaluationFailedError extensionPredicateEvaluationFailedError = builder.buildUnchecked();
         Assertions.assertThat(extensionPredicateEvaluationFailedError)
                 .isInstanceOf(ExtensionPredicateEvaluationFailedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionPredicateEvaluationFailedError.builder().message("message") },
-                new Object[] { ExtensionPredicateEvaluationFailedError.builder()
+        return new Object[][] {
+                new Object[] { "message", ExtensionPredicateEvaluationFailedError.builder().message("message") },
+                new Object[] { "errorByExtension", ExtensionPredicateEvaluationFailedError.builder()
                         .errorByExtension(new com.commercetools.api.models.error.ErrorByExtensionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionUpdateActionsFailedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionUpdateActionsFailedErrorTest.java
index 346f1652493..176cae5f2db 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionUpdateActionsFailedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExtensionUpdateActionsFailedErrorTest.java
@@ -3,34 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionUpdateActionsFailedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionUpdateActionsFailedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionUpdateActionsFailedErrorBuilder builder) {
         ExtensionUpdateActionsFailedError extensionUpdateActionsFailedError = builder.buildUnchecked();
         Assertions.assertThat(extensionUpdateActionsFailedError).isInstanceOf(ExtensionUpdateActionsFailedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionUpdateActionsFailedError.builder().message("message") },
-                new Object[] { ExtensionUpdateActionsFailedError.builder()
-                        .localizedMessage(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ExtensionUpdateActionsFailedError.builder().extensionExtraInfo("extensionExtraInfo") },
-                new Object[] { ExtensionUpdateActionsFailedError.builder()
+        return new Object[][] {
+                new Object[] { "message", ExtensionUpdateActionsFailedError.builder().message("message") },
+                new Object[] { "localizedMessage",
+                        ExtensionUpdateActionsFailedError.builder()
+                                .localizedMessage(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "extensionExtraInfo",
+                        ExtensionUpdateActionsFailedError.builder().extensionExtraInfo("extensionExtraInfo") },
+                new Object[] { "extensionErrors", ExtensionUpdateActionsFailedError.builder()
                         .extensionErrors(
                             Collections.singletonList(new com.commercetools.api.models.error.ExtensionErrorImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExternalOAuthFailedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExternalOAuthFailedErrorTest.java
index 2ad97d0e39d..0544d5b8dd9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExternalOAuthFailedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ExternalOAuthFailedErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExternalOAuthFailedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExternalOAuthFailedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExternalOAuthFailedErrorBuilder builder) {
         ExternalOAuthFailedError externalOAuthFailedError = builder.buildUnchecked();
         Assertions.assertThat(externalOAuthFailedError).isInstanceOf(ExternalOAuthFailedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExternalOAuthFailedError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", ExternalOAuthFailedError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/FeatureRemovedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/FeatureRemovedErrorTest.java
index b6ea6cc4113..06b4ff96894 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/FeatureRemovedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/FeatureRemovedErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class FeatureRemovedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(FeatureRemovedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, FeatureRemovedErrorBuilder builder) {
         FeatureRemovedError featureRemovedError = builder.buildUnchecked();
         Assertions.assertThat(featureRemovedError).isInstanceOf(FeatureRemovedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { FeatureRemovedError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", FeatureRemovedError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GeneralErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GeneralErrorTest.java
index 87685123396..53748072b26 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GeneralErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GeneralErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GeneralErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GeneralErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GeneralErrorBuilder builder) {
         GeneralError generalError = builder.buildUnchecked();
         Assertions.assertThat(generalError).isInstanceOf(GeneralError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GeneralError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", GeneralError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAnonymousIdAlreadyInUseErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAnonymousIdAlreadyInUseErrorTest.java
index 98ee5387050..e46b1433524 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAnonymousIdAlreadyInUseErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAnonymousIdAlreadyInUseErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLAnonymousIdAlreadyInUseErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAssociateMissingPermissionErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAssociateMissingPermissionErrorTest.java
index 4a877c68302..5ea8a839244 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAssociateMissingPermissionErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAssociateMissingPermissionErrorTest.java
@@ -3,40 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLAssociateMissingPermissionErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLAssociateMissingPermissionErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLAssociateMissingPermissionErrorBuilder builder) {
         GraphQLAssociateMissingPermissionError graphQLAssociateMissingPermissionError = builder.buildUnchecked();
         Assertions.assertThat(graphQLAssociateMissingPermissionError)
                 .isInstanceOf(GraphQLAssociateMissingPermissionError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLAssociateMissingPermissionError.builder()
+                new Object[] { "associate", GraphQLAssociateMissingPermissionError.builder()
                         .associate(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) },
-                new Object[] { GraphQLAssociateMissingPermissionError.builder()
+                new Object[] { "businessUnit", GraphQLAssociateMissingPermissionError.builder()
                         .businessUnit(
                             new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) },
-                new Object[] { GraphQLAssociateMissingPermissionError.builder()
-                        .associateOnBehalf(
-                            new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) },
-                new Object[] { GraphQLAssociateMissingPermissionError.builder()
+                new Object[] { "associateOnBehalf",
+                        GraphQLAssociateMissingPermissionError.builder()
+                                .associateOnBehalf(
+                                    new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) },
+                new Object[] { "permissions", GraphQLAssociateMissingPermissionError.builder()
                         .permissions(Collections.singletonList(
                             com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits"))) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAttributeDefinitionAlreadyExistsErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAttributeDefinitionAlreadyExistsErrorTest.java
index 30df86265ae..a2d0f9d71e6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAttributeDefinitionAlreadyExistsErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAttributeDefinitionAlreadyExistsErrorTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLAttributeDefinitionAlreadyExistsErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLAttributeDefinitionAlreadyExistsErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLAttributeDefinitionAlreadyExistsErrorBuilder builder) {
         GraphQLAttributeDefinitionAlreadyExistsError graphQLAttributeDefinitionAlreadyExistsError = builder
                 .buildUnchecked();
         Assertions.assertThat(graphQLAttributeDefinitionAlreadyExistsError)
                 .isInstanceOf(GraphQLAttributeDefinitionAlreadyExistsError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLAttributeDefinitionAlreadyExistsError.builder()
-                        .conflictingProductTypeId("conflictingProductTypeId") },
-                new Object[] { GraphQLAttributeDefinitionAlreadyExistsError.builder()
-                        .conflictingProductTypeName("conflictingProductTypeName") },
-                new Object[] { GraphQLAttributeDefinitionAlreadyExistsError.builder()
+                new Object[] { "conflictingProductTypeId",
+                        GraphQLAttributeDefinitionAlreadyExistsError.builder()
+                                .conflictingProductTypeId("conflictingProductTypeId") },
+                new Object[] { "conflictingProductTypeName",
+                        GraphQLAttributeDefinitionAlreadyExistsError.builder()
+                                .conflictingProductTypeName("conflictingProductTypeName") },
+                new Object[] { "conflictingAttributeName", GraphQLAttributeDefinitionAlreadyExistsError.builder()
                         .conflictingAttributeName("conflictingAttributeName") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAttributeDefinitionTypeConflictErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAttributeDefinitionTypeConflictErrorTest.java
index ad73658cf6a..5f83f4a7700 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAttributeDefinitionTypeConflictErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAttributeDefinitionTypeConflictErrorTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLAttributeDefinitionTypeConflictErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLAttributeDefinitionTypeConflictErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLAttributeDefinitionTypeConflictErrorBuilder builder) {
         GraphQLAttributeDefinitionTypeConflictError graphQLAttributeDefinitionTypeConflictError = builder
                 .buildUnchecked();
         Assertions.assertThat(graphQLAttributeDefinitionTypeConflictError)
                 .isInstanceOf(GraphQLAttributeDefinitionTypeConflictError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLAttributeDefinitionTypeConflictError.builder()
-                        .conflictingProductTypeId("conflictingProductTypeId") },
-                new Object[] { GraphQLAttributeDefinitionTypeConflictError.builder()
-                        .conflictingProductTypeName("conflictingProductTypeName") },
-                new Object[] { GraphQLAttributeDefinitionTypeConflictError.builder()
+                new Object[] { "conflictingProductTypeId",
+                        GraphQLAttributeDefinitionTypeConflictError.builder()
+                                .conflictingProductTypeId("conflictingProductTypeId") },
+                new Object[] { "conflictingProductTypeName",
+                        GraphQLAttributeDefinitionTypeConflictError.builder()
+                                .conflictingProductTypeName("conflictingProductTypeName") },
+                new Object[] { "conflictingAttributeName", GraphQLAttributeDefinitionTypeConflictError.builder()
                         .conflictingAttributeName("conflictingAttributeName") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAttributeNameDoesNotExistErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAttributeNameDoesNotExistErrorTest.java
index 19d3c8a2970..7398618c81f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAttributeNameDoesNotExistErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLAttributeNameDoesNotExistErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLAttributeNameDoesNotExistErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLAttributeNameDoesNotExistErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLAttributeNameDoesNotExistErrorBuilder builder) {
         GraphQLAttributeNameDoesNotExistError graphQLAttributeNameDoesNotExistError = builder.buildUnchecked();
         Assertions.assertThat(graphQLAttributeNameDoesNotExistError)
                 .isInstanceOf(GraphQLAttributeNameDoesNotExistError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "invalidAttributeName",
                 GraphQLAttributeNameDoesNotExistError.builder().invalidAttributeName("invalidAttributeName") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLBadGatewayErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLBadGatewayErrorTest.java
index 1de0b000bb4..d3af42ce801 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLBadGatewayErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLBadGatewayErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLBadGatewayErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLConcurrentModificationErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLConcurrentModificationErrorTest.java
index 402c5eb0beb..20ac8688f12 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLConcurrentModificationErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLConcurrentModificationErrorTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLConcurrentModificationErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLConcurrentModificationErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLConcurrentModificationErrorBuilder builder) {
         GraphQLConcurrentModificationError graphQLConcurrentModificationError = builder.buildUnchecked();
         Assertions.assertThat(graphQLConcurrentModificationError)
                 .isInstanceOf(GraphQLConcurrentModificationError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLConcurrentModificationError.builder().currentVersion(4L) } };
+        return new Object[][] {
+                new Object[] { "currentVersion", GraphQLConcurrentModificationError.builder().currentVersion(4L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLContentTooLargeErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLContentTooLargeErrorTest.java
index 68841653813..4094571804d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLContentTooLargeErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLContentTooLargeErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLContentTooLargeErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLCountryNotConfiguredInStoreErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLCountryNotConfiguredInStoreErrorTest.java
index dfa44292930..a5cf12c6859 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLCountryNotConfiguredInStoreErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLCountryNotConfiguredInStoreErrorTest.java
@@ -3,34 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLCountryNotConfiguredInStoreErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLCountryNotConfiguredInStoreErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLCountryNotConfiguredInStoreErrorBuilder builder) {
         GraphQLCountryNotConfiguredInStoreError graphQLCountryNotConfiguredInStoreError = builder.buildUnchecked();
         Assertions.assertThat(graphQLCountryNotConfiguredInStoreError)
                 .isInstanceOf(GraphQLCountryNotConfiguredInStoreError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLCountryNotConfiguredInStoreError.builder()
-                        .storeCountries(Collections.singletonList("storeCountries")) },
-                new Object[] { GraphQLCountryNotConfiguredInStoreError.builder().country("country") } };
+                new Object[] { "storeCountries",
+                        GraphQLCountryNotConfiguredInStoreError.builder()
+                                .storeCountries(Collections.singletonList("storeCountries")) },
+                new Object[] { "country", GraphQLCountryNotConfiguredInStoreError.builder().country("country") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDiscountCodeNonApplicableErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDiscountCodeNonApplicableErrorTest.java
index e98de00b7ca..b37af6d4fae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDiscountCodeNonApplicableErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDiscountCodeNonApplicableErrorTest.java
@@ -3,39 +3,35 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLDiscountCodeNonApplicableErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLDiscountCodeNonApplicableErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLDiscountCodeNonApplicableErrorBuilder builder) {
         GraphQLDiscountCodeNonApplicableError graphQLDiscountCodeNonApplicableError = builder.buildUnchecked();
         Assertions.assertThat(graphQLDiscountCodeNonApplicableError)
                 .isInstanceOf(GraphQLDiscountCodeNonApplicableError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLDiscountCodeNonApplicableError.builder().discountCode("discountCode") },
-                new Object[] { GraphQLDiscountCodeNonApplicableError.builder().reason("reason") },
-                new Object[] { GraphQLDiscountCodeNonApplicableError.builder().discountCodeId("discountCodeId") },
-                new Object[] { GraphQLDiscountCodeNonApplicableError.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { GraphQLDiscountCodeNonApplicableError.builder()
-                        .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { GraphQLDiscountCodeNonApplicableError.builder()
+                new Object[] { "discountCode",
+                        GraphQLDiscountCodeNonApplicableError.builder().discountCode("discountCode") },
+                new Object[] { "reason", GraphQLDiscountCodeNonApplicableError.builder().reason("reason") },
+                new Object[] { "discountCodeId",
+                        GraphQLDiscountCodeNonApplicableError.builder().discountCodeId("discountCodeId") },
+                new Object[] { "validFrom",
+                        GraphQLDiscountCodeNonApplicableError.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        GraphQLDiscountCodeNonApplicableError.builder()
+                                .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validityCheckTime", GraphQLDiscountCodeNonApplicableError.builder()
                         .validityCheckTime(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateAttributeValueErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateAttributeValueErrorTest.java
index 62ffba8c98a..4854bdd48df 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateAttributeValueErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateAttributeValueErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLDuplicateAttributeValueErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLDuplicateAttributeValueErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLDuplicateAttributeValueErrorBuilder builder) {
         GraphQLDuplicateAttributeValueError graphQLDuplicateAttributeValueError = builder.buildUnchecked();
         Assertions.assertThat(graphQLDuplicateAttributeValueError)
                 .isInstanceOf(GraphQLDuplicateAttributeValueError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLDuplicateAttributeValueError.builder()
+        return new Object[][] { new Object[] { "attribute", GraphQLDuplicateAttributeValueError.builder()
                 .attribute(new com.commercetools.api.models.product.AttributeImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateAttributeValuesErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateAttributeValuesErrorTest.java
index e4e19db60cc..941203d99ce 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateAttributeValuesErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateAttributeValuesErrorTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLDuplicateAttributeValuesErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLDuplicateAttributeValuesErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLDuplicateAttributeValuesErrorBuilder builder) {
         GraphQLDuplicateAttributeValuesError graphQLDuplicateAttributeValuesError = builder.buildUnchecked();
         Assertions.assertThat(graphQLDuplicateAttributeValuesError)
                 .isInstanceOf(GraphQLDuplicateAttributeValuesError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLDuplicateAttributeValuesError.builder()
+        return new Object[][] { new Object[] { "attributes", GraphQLDuplicateAttributeValuesError.builder()
                 .attributes(Collections.singletonList(new com.commercetools.api.models.product.AttributeImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateEnumValuesErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateEnumValuesErrorTest.java
index e57c097d0f9..7f226bb49ce 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateEnumValuesErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateEnumValuesErrorTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLDuplicateEnumValuesErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLDuplicateEnumValuesErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLDuplicateEnumValuesErrorBuilder builder) {
         GraphQLDuplicateEnumValuesError graphQLDuplicateEnumValuesError = builder.buildUnchecked();
         Assertions.assertThat(graphQLDuplicateEnumValuesError).isInstanceOf(GraphQLDuplicateEnumValuesError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "duplicates",
                 GraphQLDuplicateEnumValuesError.builder().duplicates(Collections.singletonList("duplicates")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateFieldErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateFieldErrorTest.java
index 9990bb27061..7f07304f4d9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateFieldErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateFieldErrorTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLDuplicateFieldErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLDuplicateFieldErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLDuplicateFieldErrorBuilder builder) {
         GraphQLDuplicateFieldError graphQLDuplicateFieldError = builder.buildUnchecked();
         Assertions.assertThat(graphQLDuplicateFieldError).isInstanceOf(GraphQLDuplicateFieldError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLDuplicateFieldError.builder().field("field") },
-                new Object[] { GraphQLDuplicateFieldError.builder().duplicateValue("duplicateValue") } };
+        return new Object[][] { new Object[] { "field", GraphQLDuplicateFieldError.builder().field("field") },
+                new Object[] { "duplicateValue",
+                        GraphQLDuplicateFieldError.builder().duplicateValue("duplicateValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateFieldWithConflictingResourceErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateFieldWithConflictingResourceErrorTest.java
index 3a9959d485f..bc4ed1f8f99 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateFieldWithConflictingResourceErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateFieldWithConflictingResourceErrorTest.java
@@ -1,36 +1,28 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLDuplicateFieldWithConflictingResourceErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLDuplicateFieldWithConflictingResourceErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLDuplicateFieldWithConflictingResourceErrorBuilder builder) {
         GraphQLDuplicateFieldWithConflictingResourceError graphQLDuplicateFieldWithConflictingResourceError = builder
                 .buildUnchecked();
         Assertions.assertThat(graphQLDuplicateFieldWithConflictingResourceError)
                 .isInstanceOf(GraphQLDuplicateFieldWithConflictingResourceError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLDuplicateFieldWithConflictingResourceError.builder().field("field") },
-                new Object[] {
+                new Object[] { "field", GraphQLDuplicateFieldWithConflictingResourceError.builder().field("field") },
+                new Object[] { "duplicateValue",
                         GraphQLDuplicateFieldWithConflictingResourceError.builder().duplicateValue("duplicateValue") },
-                new Object[] { GraphQLDuplicateFieldWithConflictingResourceError.builder()
+                new Object[] { "conflictingResource", GraphQLDuplicateFieldWithConflictingResourceError.builder()
                         .conflictingResource(new com.commercetools.api.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicatePriceKeyErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicatePriceKeyErrorTest.java
index a7a26812f8e..f381d7436dd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicatePriceKeyErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicatePriceKeyErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLDuplicatePriceKeyErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLDuplicatePriceKeyErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLDuplicatePriceKeyErrorBuilder builder) {
         GraphQLDuplicatePriceKeyError graphQLDuplicatePriceKeyError = builder.buildUnchecked();
         Assertions.assertThat(graphQLDuplicatePriceKeyError).isInstanceOf(GraphQLDuplicatePriceKeyError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLDuplicatePriceKeyError.builder()
+        return new Object[][] { new Object[] { "conflictingPrice", GraphQLDuplicatePriceKeyError.builder()
                 .conflictingPrice(new com.commercetools.api.models.common.PriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicatePriceScopeErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicatePriceScopeErrorTest.java
index 6988559aa9e..658741e5161 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicatePriceScopeErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicatePriceScopeErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLDuplicatePriceScopeErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLDuplicatePriceScopeErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLDuplicatePriceScopeErrorBuilder builder) {
         GraphQLDuplicatePriceScopeError graphQLDuplicatePriceScopeError = builder.buildUnchecked();
         Assertions.assertThat(graphQLDuplicatePriceScopeError).isInstanceOf(GraphQLDuplicatePriceScopeError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLDuplicatePriceScopeError.builder()
+        return new Object[][] { new Object[] { "conflictingPrice", GraphQLDuplicatePriceScopeError.builder()
                 .conflictingPrice(new com.commercetools.api.models.common.PriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateStandalonePriceScopeErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateStandalonePriceScopeErrorTest.java
index f3d2c11a109..e3c007dee2b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateStandalonePriceScopeErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateStandalonePriceScopeErrorTest.java
@@ -3,45 +3,40 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLDuplicateStandalonePriceScopeErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLDuplicateStandalonePriceScopeErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLDuplicateStandalonePriceScopeErrorBuilder builder) {
         GraphQLDuplicateStandalonePriceScopeError graphQLDuplicateStandalonePriceScopeError = builder.buildUnchecked();
         Assertions.assertThat(graphQLDuplicateStandalonePriceScopeError)
                 .isInstanceOf(GraphQLDuplicateStandalonePriceScopeError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLDuplicateStandalonePriceScopeError.builder()
-                        .conflictingStandalonePrice(
-                            new com.commercetools.api.models.standalone_price.StandalonePriceReferenceImpl()) },
-                new Object[] { GraphQLDuplicateStandalonePriceScopeError.builder().sku("sku") },
-                new Object[] { GraphQLDuplicateStandalonePriceScopeError.builder().currency("currency") },
-                new Object[] { GraphQLDuplicateStandalonePriceScopeError.builder().country("country") },
-                new Object[] { GraphQLDuplicateStandalonePriceScopeError.builder()
+                new Object[] { "conflictingStandalonePrice",
+                        GraphQLDuplicateStandalonePriceScopeError.builder()
+                                .conflictingStandalonePrice(
+                                    new com.commercetools.api.models.standalone_price.StandalonePriceReferenceImpl()) },
+                new Object[] { "sku", GraphQLDuplicateStandalonePriceScopeError.builder().sku("sku") },
+                new Object[] { "currency", GraphQLDuplicateStandalonePriceScopeError.builder().currency("currency") },
+                new Object[] { "country", GraphQLDuplicateStandalonePriceScopeError.builder().country("country") },
+                new Object[] { "customerGroup", GraphQLDuplicateStandalonePriceScopeError.builder()
                         .customerGroup(
                             new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) },
-                new Object[] { GraphQLDuplicateStandalonePriceScopeError.builder()
-                        .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { GraphQLDuplicateStandalonePriceScopeError.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { GraphQLDuplicateStandalonePriceScopeError.builder()
+                new Object[] { "channel",
+                        GraphQLDuplicateStandalonePriceScopeError.builder()
+                                .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "validFrom",
+                        GraphQLDuplicateStandalonePriceScopeError.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil", GraphQLDuplicateStandalonePriceScopeError.builder()
                         .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateVariantValuesErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateVariantValuesErrorTest.java
index d181ab5c206..202e022518d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateVariantValuesErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLDuplicateVariantValuesErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLDuplicateVariantValuesErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLDuplicateVariantValuesErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLDuplicateVariantValuesErrorBuilder builder) {
         GraphQLDuplicateVariantValuesError graphQLDuplicateVariantValuesError = builder.buildUnchecked();
         Assertions.assertThat(graphQLDuplicateVariantValuesError)
                 .isInstanceOf(GraphQLDuplicateVariantValuesError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLDuplicateVariantValuesError.builder()
+        return new Object[][] { new Object[] { "variantValues", GraphQLDuplicateVariantValuesError.builder()
                 .variantValues(new com.commercetools.api.models.error.VariantValuesImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEditPreviewFailedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEditPreviewFailedErrorTest.java
index 46cab8cb65d..04a6405212c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEditPreviewFailedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEditPreviewFailedErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLEditPreviewFailedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLEditPreviewFailedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLEditPreviewFailedErrorBuilder builder) {
         GraphQLEditPreviewFailedError graphQLEditPreviewFailedError = builder.buildUnchecked();
         Assertions.assertThat(graphQLEditPreviewFailedError).isInstanceOf(GraphQLEditPreviewFailedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLEditPreviewFailedError.builder()
+        return new Object[][] { new Object[] { "result", GraphQLEditPreviewFailedError.builder()
                 .result(new com.commercetools.api.models.order_edit.OrderEditPreviewFailureImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumKeyAlreadyExistsErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumKeyAlreadyExistsErrorTest.java
index 6e5491a0352..3ea8fca5b7c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumKeyAlreadyExistsErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumKeyAlreadyExistsErrorTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLEnumKeyAlreadyExistsErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLEnumKeyAlreadyExistsErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLEnumKeyAlreadyExistsErrorBuilder builder) {
         GraphQLEnumKeyAlreadyExistsError graphQLEnumKeyAlreadyExistsError = builder.buildUnchecked();
         Assertions.assertThat(graphQLEnumKeyAlreadyExistsError).isInstanceOf(GraphQLEnumKeyAlreadyExistsError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLEnumKeyAlreadyExistsError.builder().conflictingEnumKey("conflictingEnumKey") },
-                new Object[] { GraphQLEnumKeyAlreadyExistsError.builder()
+                new Object[] { "conflictingEnumKey",
+                        GraphQLEnumKeyAlreadyExistsError.builder().conflictingEnumKey("conflictingEnumKey") },
+                new Object[] { "conflictingAttributeName", GraphQLEnumKeyAlreadyExistsError.builder()
                         .conflictingAttributeName("conflictingAttributeName") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumKeyDoesNotExistErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumKeyDoesNotExistErrorTest.java
index a4a9a3e87a5..4a494e80abc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumKeyDoesNotExistErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumKeyDoesNotExistErrorTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLEnumKeyDoesNotExistErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLEnumKeyDoesNotExistErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLEnumKeyDoesNotExistErrorBuilder builder) {
         GraphQLEnumKeyDoesNotExistError graphQLEnumKeyDoesNotExistError = builder.buildUnchecked();
         Assertions.assertThat(graphQLEnumKeyDoesNotExistError).isInstanceOf(GraphQLEnumKeyDoesNotExistError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLEnumKeyDoesNotExistError.builder().conflictingEnumKey("conflictingEnumKey") },
-                new Object[] { GraphQLEnumKeyDoesNotExistError.builder()
+                new Object[] { "conflictingEnumKey",
+                        GraphQLEnumKeyDoesNotExistError.builder().conflictingEnumKey("conflictingEnumKey") },
+                new Object[] { "conflictingAttributeName", GraphQLEnumKeyDoesNotExistError.builder()
                         .conflictingAttributeName("conflictingAttributeName") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumValueIsUsedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumValueIsUsedErrorTest.java
index ee7913fc211..bbdc260ed37 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumValueIsUsedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumValueIsUsedErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLEnumValueIsUsedErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumValuesMustMatchErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumValuesMustMatchErrorTest.java
index d580aaddd03..995388785b8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumValuesMustMatchErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLEnumValuesMustMatchErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLEnumValuesMustMatchErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionBadResponseErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionBadResponseErrorTest.java
index d9a042ff2c2..35ebd2279b1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionBadResponseErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionBadResponseErrorTest.java
@@ -3,41 +3,38 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLExtensionBadResponseErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLExtensionBadResponseErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLExtensionBadResponseErrorBuilder builder) {
         GraphQLExtensionBadResponseError graphQLExtensionBadResponseError = builder.buildUnchecked();
         Assertions.assertThat(graphQLExtensionBadResponseError).isInstanceOf(GraphQLExtensionBadResponseError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLExtensionBadResponseError.builder()
-                        .localizedMessage(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { GraphQLExtensionBadResponseError.builder().extensionExtraInfo("extensionExtraInfo") },
-                new Object[] {
+                new Object[] { "localizedMessage",
+                        GraphQLExtensionBadResponseError.builder()
+                                .localizedMessage(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "extensionExtraInfo",
+                        GraphQLExtensionBadResponseError.builder().extensionExtraInfo("extensionExtraInfo") },
+                new Object[] { "extensionErrors",
                         GraphQLExtensionBadResponseError.builder()
                                 .extensionErrors(Collections
                                         .singletonList(new com.commercetools.api.models.error.ExtensionErrorImpl())) },
-                new Object[] { GraphQLExtensionBadResponseError.builder().extensionBody("extensionBody") },
-                new Object[] { GraphQLExtensionBadResponseError.builder().extensionStatusCode(3) },
-                new Object[] { GraphQLExtensionBadResponseError.builder().extensionId("extensionId") },
-                new Object[] { GraphQLExtensionBadResponseError.builder().extensionKey("extensionKey") } };
+                new Object[] { "extensionBody",
+                        GraphQLExtensionBadResponseError.builder().extensionBody("extensionBody") },
+                new Object[] { "extensionStatusCode",
+                        GraphQLExtensionBadResponseError.builder().extensionStatusCode(3) },
+                new Object[] { "extensionId", GraphQLExtensionBadResponseError.builder().extensionId("extensionId") },
+                new Object[] { "extensionKey",
+                        GraphQLExtensionBadResponseError.builder().extensionKey("extensionKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionNoResponseErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionNoResponseErrorTest.java
index 41f47bb4bcb..019e5664889 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionNoResponseErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionNoResponseErrorTest.java
@@ -1,31 +1,25 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLExtensionNoResponseErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLExtensionNoResponseErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLExtensionNoResponseErrorBuilder builder) {
         GraphQLExtensionNoResponseError graphQLExtensionNoResponseError = builder.buildUnchecked();
         Assertions.assertThat(graphQLExtensionNoResponseError).isInstanceOf(GraphQLExtensionNoResponseError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLExtensionNoResponseError.builder().extensionId("extensionId") },
-                new Object[] { GraphQLExtensionNoResponseError.builder().extensionKey("extensionKey") } };
+        return new Object[][] {
+                new Object[] { "extensionId", GraphQLExtensionNoResponseError.builder().extensionId("extensionId") },
+                new Object[] { "extensionKey",
+                        GraphQLExtensionNoResponseError.builder().extensionKey("extensionKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionPredicateEvaluationFailedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionPredicateEvaluationFailedErrorTest.java
index 6a72a3319e3..870fc7a1500 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionPredicateEvaluationFailedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionPredicateEvaluationFailedErrorTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLExtensionPredicateEvaluationFailedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLExtensionPredicateEvaluationFailedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLExtensionPredicateEvaluationFailedErrorBuilder builder) {
         GraphQLExtensionPredicateEvaluationFailedError graphQLExtensionPredicateEvaluationFailedError = builder
                 .buildUnchecked();
         Assertions.assertThat(graphQLExtensionPredicateEvaluationFailedError)
                 .isInstanceOf(GraphQLExtensionPredicateEvaluationFailedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLExtensionPredicateEvaluationFailedError.builder()
-                .errorByExtension(new com.commercetools.api.models.error.ErrorByExtensionImpl()) } };
+        return new Object[][] {
+                new Object[] { "errorByExtension", GraphQLExtensionPredicateEvaluationFailedError.builder()
+                        .errorByExtension(new com.commercetools.api.models.error.ErrorByExtensionImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionUpdateActionsFailedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionUpdateActionsFailedErrorTest.java
index 5d679ad4fc5..6e5fe34851a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionUpdateActionsFailedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExtensionUpdateActionsFailedErrorTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLExtensionUpdateActionsFailedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLExtensionUpdateActionsFailedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLExtensionUpdateActionsFailedErrorBuilder builder) {
         GraphQLExtensionUpdateActionsFailedError graphQLExtensionUpdateActionsFailedError = builder.buildUnchecked();
         Assertions.assertThat(graphQLExtensionUpdateActionsFailedError)
                 .isInstanceOf(GraphQLExtensionUpdateActionsFailedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLExtensionUpdateActionsFailedError.builder()
-                        .localizedMessage(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+                new Object[] { "localizedMessage",
+                        GraphQLExtensionUpdateActionsFailedError.builder()
+                                .localizedMessage(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "extensionExtraInfo",
                         GraphQLExtensionUpdateActionsFailedError.builder().extensionExtraInfo("extensionExtraInfo") },
-                new Object[] { GraphQLExtensionUpdateActionsFailedError.builder()
+                new Object[] { "extensionErrors", GraphQLExtensionUpdateActionsFailedError.builder()
                         .extensionErrors(
                             Collections.singletonList(new com.commercetools.api.models.error.ExtensionErrorImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExternalOAuthFailedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExternalOAuthFailedErrorTest.java
index ae949268917..4d692bf442a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExternalOAuthFailedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLExternalOAuthFailedErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLExternalOAuthFailedErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLFeatureRemovedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLFeatureRemovedErrorTest.java
index c4d671d6343..718a668a18e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLFeatureRemovedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLFeatureRemovedErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLFeatureRemovedErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLGeneralErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLGeneralErrorTest.java
index 3126eaa6165..fa232f5212f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLGeneralErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLGeneralErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLGeneralErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInsufficientScopeErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInsufficientScopeErrorTest.java
index 0a6be01d133..0c09ae04e00 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInsufficientScopeErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInsufficientScopeErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLInsufficientScopeErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInternalConstraintViolatedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInternalConstraintViolatedErrorTest.java
index e9e44c1c86f..57263679f79 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInternalConstraintViolatedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInternalConstraintViolatedErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLInternalConstraintViolatedErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidCredentialsErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidCredentialsErrorTest.java
index 09ab85b1f60..60c3aa9a31c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidCredentialsErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidCredentialsErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLInvalidCredentialsErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidCurrentPasswordErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidCurrentPasswordErrorTest.java
index 8d4b9f19b2c..ab5284887a3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidCurrentPasswordErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidCurrentPasswordErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLInvalidCurrentPasswordErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidFieldErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidFieldErrorTest.java
index fb562ead446..cccf92b0004 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidFieldErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidFieldErrorTest.java
@@ -3,32 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLInvalidFieldErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLInvalidFieldErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLInvalidFieldErrorBuilder builder) {
         GraphQLInvalidFieldError graphQLInvalidFieldError = builder.buildUnchecked();
         Assertions.assertThat(graphQLInvalidFieldError).isInstanceOf(GraphQLInvalidFieldError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLInvalidFieldError.builder().field("field") },
-                new Object[] { GraphQLInvalidFieldError.builder().invalidValue("invalidValue") },
-                new Object[] { GraphQLInvalidFieldError.builder()
+        return new Object[][] { new Object[] { "field", GraphQLInvalidFieldError.builder().field("field") },
+                new Object[] { "invalidValue", GraphQLInvalidFieldError.builder().invalidValue("invalidValue") },
+                new Object[] { "allowedValues", GraphQLInvalidFieldError.builder()
                         .allowedValues(Collections.singletonList("allowedValues")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidInputErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidInputErrorTest.java
index 81bfb450ac8..71720533283 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidInputErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidInputErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLInvalidInputErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidItemShippingDetailsErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidItemShippingDetailsErrorTest.java
index 2122e680123..96e7446649a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidItemShippingDetailsErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidItemShippingDetailsErrorTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLInvalidItemShippingDetailsErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLInvalidItemShippingDetailsErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLInvalidItemShippingDetailsErrorBuilder builder) {
         GraphQLInvalidItemShippingDetailsError graphQLInvalidItemShippingDetailsError = builder.buildUnchecked();
         Assertions.assertThat(graphQLInvalidItemShippingDetailsError)
                 .isInstanceOf(GraphQLInvalidItemShippingDetailsError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLInvalidItemShippingDetailsError.builder().subject("subject") },
-                new Object[] { GraphQLInvalidItemShippingDetailsError.builder().itemId("itemId") } };
+        return new Object[][] {
+                new Object[] { "subject", GraphQLInvalidItemShippingDetailsError.builder().subject("subject") },
+                new Object[] { "itemId", GraphQLInvalidItemShippingDetailsError.builder().itemId("itemId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidJsonInputErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidJsonInputErrorTest.java
index d11e052ea22..a736c7a41b1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidJsonInputErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidJsonInputErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLInvalidJsonInputErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLInvalidJsonInputErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLInvalidJsonInputErrorBuilder builder) {
         GraphQLInvalidJsonInputError graphQLInvalidJsonInputError = builder.buildUnchecked();
         Assertions.assertThat(graphQLInvalidJsonInputError).isInstanceOf(GraphQLInvalidJsonInputError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { GraphQLInvalidJsonInputError.builder().detailedErrorMessage("detailedErrorMessage") } };
+        return new Object[][] { new Object[] { "detailedErrorMessage",
+                GraphQLInvalidJsonInputError.builder().detailedErrorMessage("detailedErrorMessage") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidOperationErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidOperationErrorTest.java
index efcf9d9ced9..d8364109e20 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidOperationErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidOperationErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLInvalidOperationErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidSubjectErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidSubjectErrorTest.java
index de88e6ab6f0..753c9f6fe6f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidSubjectErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidSubjectErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLInvalidSubjectErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidTokenErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidTokenErrorTest.java
index bb9557b9b02..902923ca38c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidTokenErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLInvalidTokenErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLInvalidTokenErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLLanguageUsedInStoresErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLLanguageUsedInStoresErrorTest.java
index c4630f33ed9..6b5fbbf98c8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLLanguageUsedInStoresErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLLanguageUsedInStoresErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLLanguageUsedInStoresErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLLockedFieldErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLLockedFieldErrorTest.java
index 6e43a20cffb..72ec76772b6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLLockedFieldErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLLockedFieldErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLLockedFieldErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLLockedFieldErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLLockedFieldErrorBuilder builder) {
         GraphQLLockedFieldError graphQLLockedFieldError = builder.buildUnchecked();
         Assertions.assertThat(graphQLLockedFieldError).isInstanceOf(GraphQLLockedFieldError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLLockedFieldError.builder().field("field") } };
+        return new Object[][] { new Object[] { "field", GraphQLLockedFieldError.builder().field("field") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMatchingPriceNotFoundErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMatchingPriceNotFoundErrorTest.java
index 1278e69659f..235575f8895 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMatchingPriceNotFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMatchingPriceNotFoundErrorTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLMatchingPriceNotFoundErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLMatchingPriceNotFoundErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLMatchingPriceNotFoundErrorBuilder builder) {
         GraphQLMatchingPriceNotFoundError graphQLMatchingPriceNotFoundError = builder.buildUnchecked();
         Assertions.assertThat(graphQLMatchingPriceNotFoundError).isInstanceOf(GraphQLMatchingPriceNotFoundError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLMatchingPriceNotFoundError.builder().productId("productId") },
-                new Object[] { GraphQLMatchingPriceNotFoundError.builder().variantId(5) },
-                new Object[] { GraphQLMatchingPriceNotFoundError.builder().currency("currency") },
-                new Object[] { GraphQLMatchingPriceNotFoundError.builder().country("country") },
-                new Object[] { GraphQLMatchingPriceNotFoundError.builder()
+        return new Object[][] {
+                new Object[] { "productId", GraphQLMatchingPriceNotFoundError.builder().productId("productId") },
+                new Object[] { "variantId", GraphQLMatchingPriceNotFoundError.builder().variantId(5) },
+                new Object[] { "currency", GraphQLMatchingPriceNotFoundError.builder().currency("currency") },
+                new Object[] { "country", GraphQLMatchingPriceNotFoundError.builder().country("country") },
+                new Object[] { "customerGroup", GraphQLMatchingPriceNotFoundError.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] { GraphQLMatchingPriceNotFoundError.builder()
+                new Object[] { "channel", GraphQLMatchingPriceNotFoundError.builder()
                         .channel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMaxCartDiscountsReachedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMaxCartDiscountsReachedErrorTest.java
index 4ce15a35b33..b30781197b8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMaxCartDiscountsReachedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMaxCartDiscountsReachedErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLMaxCartDiscountsReachedErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMaxResourceLimitExceededErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMaxResourceLimitExceededErrorTest.java
index 0740e5f1dfb..a9bf883e0e9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMaxResourceLimitExceededErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMaxResourceLimitExceededErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLMaxResourceLimitExceededErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLMaxResourceLimitExceededErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLMaxResourceLimitExceededErrorBuilder builder) {
         GraphQLMaxResourceLimitExceededError graphQLMaxResourceLimitExceededError = builder.buildUnchecked();
         Assertions.assertThat(graphQLMaxResourceLimitExceededError)
                 .isInstanceOf(GraphQLMaxResourceLimitExceededError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLMaxResourceLimitExceededError.builder()
+        return new Object[][] { new Object[] { "exceededResource", GraphQLMaxResourceLimitExceededError.builder()
                 .exceededResource(com.commercetools.api.models.common.ReferenceTypeId.findEnum("approval-flow")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMaxStoreReferencesReachedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMaxStoreReferencesReachedErrorTest.java
index 259144b4394..b791d2e50f9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMaxStoreReferencesReachedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMaxStoreReferencesReachedErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLMaxStoreReferencesReachedErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMissingRoleOnChannelErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMissingRoleOnChannelErrorTest.java
index e13bfe8146c..1b833355fe8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMissingRoleOnChannelErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMissingRoleOnChannelErrorTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLMissingRoleOnChannelErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLMissingRoleOnChannelErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLMissingRoleOnChannelErrorBuilder builder) {
         GraphQLMissingRoleOnChannelError graphQLMissingRoleOnChannelError = builder.buildUnchecked();
         Assertions.assertThat(graphQLMissingRoleOnChannelError).isInstanceOf(GraphQLMissingRoleOnChannelError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLMissingRoleOnChannelError.builder()
-                        .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { GraphQLMissingRoleOnChannelError.builder()
+                new Object[] { "channel",
+                        GraphQLMissingRoleOnChannelError.builder()
+                                .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "missingRole", GraphQLMissingRoleOnChannelError.builder()
                         .missingRole(
                             com.commercetools.api.models.channel.ChannelRoleEnum.findEnum("InventorySupply")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMissingTaxRateForCountryErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMissingTaxRateForCountryErrorTest.java
index d2d7dead8cf..56f1927a958 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMissingTaxRateForCountryErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMissingTaxRateForCountryErrorTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLMissingTaxRateForCountryErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLMissingTaxRateForCountryErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLMissingTaxRateForCountryErrorBuilder builder) {
         GraphQLMissingTaxRateForCountryError graphQLMissingTaxRateForCountryError = builder.buildUnchecked();
         Assertions.assertThat(graphQLMissingTaxRateForCountryError)
                 .isInstanceOf(GraphQLMissingTaxRateForCountryError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLMissingTaxRateForCountryError.builder().taxCategoryId("taxCategoryId") },
-                new Object[] { GraphQLMissingTaxRateForCountryError.builder().country("country") },
-                new Object[] { GraphQLMissingTaxRateForCountryError.builder().state("state") } };
+                new Object[] { "taxCategoryId",
+                        GraphQLMissingTaxRateForCountryError.builder().taxCategoryId("taxCategoryId") },
+                new Object[] { "country", GraphQLMissingTaxRateForCountryError.builder().country("country") },
+                new Object[] { "state", GraphQLMissingTaxRateForCountryError.builder().state("state") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMoneyOverflowErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMoneyOverflowErrorTest.java
index f3088f3a844..f403f520f38 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMoneyOverflowErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLMoneyOverflowErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLMoneyOverflowErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLNoMatchingProductDiscountFoundErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLNoMatchingProductDiscountFoundErrorTest.java
index e021b7d537a..5e2efbb2c7a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLNoMatchingProductDiscountFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLNoMatchingProductDiscountFoundErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLNoMatchingProductDiscountFoundErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLObjectNotFoundErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLObjectNotFoundErrorTest.java
index 4b1a0538bee..74d81da8099 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLObjectNotFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLObjectNotFoundErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLObjectNotFoundErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLOutOfStockErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLOutOfStockErrorTest.java
index e63345b51b3..923d2b3d226 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLOutOfStockErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLOutOfStockErrorTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLOutOfStockErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLOutOfStockErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLOutOfStockErrorBuilder builder) {
         GraphQLOutOfStockError graphQLOutOfStockError = builder.buildUnchecked();
         Assertions.assertThat(graphQLOutOfStockError).isInstanceOf(GraphQLOutOfStockError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLOutOfStockError.builder().lineItems(Collections.singletonList("lineItems")) },
-                new Object[] { GraphQLOutOfStockError.builder().skus(Collections.singletonList("skus")) } };
+                new Object[] { "lineItems",
+                        GraphQLOutOfStockError.builder().lineItems(Collections.singletonList("lineItems")) },
+                new Object[] { "skus", GraphQLOutOfStockError.builder().skus(Collections.singletonList("skus")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLOverCapacityErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLOverCapacityErrorTest.java
index 44fd2838690..6c227e19fcc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLOverCapacityErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLOverCapacityErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLOverCapacityErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLOverlappingStandalonePriceValidityErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLOverlappingStandalonePriceValidityErrorTest.java
index dcd3a54abab..f394678a979 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLOverlappingStandalonePriceValidityErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLOverlappingStandalonePriceValidityErrorTest.java
@@ -3,50 +3,48 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLOverlappingStandalonePriceValidityErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLOverlappingStandalonePriceValidityErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLOverlappingStandalonePriceValidityErrorBuilder builder) {
         GraphQLOverlappingStandalonePriceValidityError graphQLOverlappingStandalonePriceValidityError = builder
                 .buildUnchecked();
         Assertions.assertThat(graphQLOverlappingStandalonePriceValidityError)
                 .isInstanceOf(GraphQLOverlappingStandalonePriceValidityError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLOverlappingStandalonePriceValidityError.builder()
-                        .conflictingStandalonePrice(
-                            new com.commercetools.api.models.standalone_price.StandalonePriceReferenceImpl()) },
-                new Object[] { GraphQLOverlappingStandalonePriceValidityError.builder().sku("sku") },
-                new Object[] { GraphQLOverlappingStandalonePriceValidityError.builder().currency("currency") },
-                new Object[] { GraphQLOverlappingStandalonePriceValidityError.builder().country("country") },
-                new Object[] { GraphQLOverlappingStandalonePriceValidityError.builder()
+                new Object[] { "conflictingStandalonePrice",
+                        GraphQLOverlappingStandalonePriceValidityError.builder()
+                                .conflictingStandalonePrice(
+                                    new com.commercetools.api.models.standalone_price.StandalonePriceReferenceImpl()) },
+                new Object[] { "sku", GraphQLOverlappingStandalonePriceValidityError.builder().sku("sku") },
+                new Object[] { "currency",
+                        GraphQLOverlappingStandalonePriceValidityError.builder().currency("currency") },
+                new Object[] { "country", GraphQLOverlappingStandalonePriceValidityError.builder().country("country") },
+                new Object[] { "customerGroup", GraphQLOverlappingStandalonePriceValidityError.builder()
                         .customerGroup(
                             new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) },
-                new Object[] { GraphQLOverlappingStandalonePriceValidityError.builder()
-                        .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { GraphQLOverlappingStandalonePriceValidityError.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { GraphQLOverlappingStandalonePriceValidityError.builder()
-                        .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { GraphQLOverlappingStandalonePriceValidityError.builder()
-                        .conflictingValidFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { GraphQLOverlappingStandalonePriceValidityError.builder()
+                new Object[] { "channel",
+                        GraphQLOverlappingStandalonePriceValidityError.builder()
+                                .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "validFrom",
+                        GraphQLOverlappingStandalonePriceValidityError.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        GraphQLOverlappingStandalonePriceValidityError.builder()
+                                .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "conflictingValidFrom",
+                        GraphQLOverlappingStandalonePriceValidityError.builder()
+                                .conflictingValidFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "conflictingValidUntil", GraphQLOverlappingStandalonePriceValidityError.builder()
                         .conflictingValidUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLPendingOperationErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLPendingOperationErrorTest.java
index 52bdb033bd5..ed5c0660659 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLPendingOperationErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLPendingOperationErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLPendingOperationErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLPriceChangedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLPriceChangedErrorTest.java
index 8d3b1e743f9..463b2ac7bd7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLPriceChangedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLPriceChangedErrorTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLPriceChangedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLPriceChangedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLPriceChangedErrorBuilder builder) {
         GraphQLPriceChangedError graphQLPriceChangedError = builder.buildUnchecked();
         Assertions.assertThat(graphQLPriceChangedError).isInstanceOf(GraphQLPriceChangedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLPriceChangedError.builder().lineItems(Collections.singletonList("lineItems")) },
-                new Object[] { GraphQLPriceChangedError.builder().shipping(true) } };
+                new Object[] { "lineItems",
+                        GraphQLPriceChangedError.builder().lineItems(Collections.singletonList("lineItems")) },
+                new Object[] { "shipping", GraphQLPriceChangedError.builder().shipping(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLProductAssignmentMissingErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLProductAssignmentMissingErrorTest.java
index 1bce6f3f22c..78279116168 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLProductAssignmentMissingErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLProductAssignmentMissingErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLProductAssignmentMissingErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLProductAssignmentMissingErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLProductAssignmentMissingErrorBuilder builder) {
         GraphQLProductAssignmentMissingError graphQLProductAssignmentMissingError = builder.buildUnchecked();
         Assertions.assertThat(graphQLProductAssignmentMissingError)
                 .isInstanceOf(GraphQLProductAssignmentMissingError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLProductAssignmentMissingError.builder()
+        return new Object[][] { new Object[] { "product", GraphQLProductAssignmentMissingError.builder()
                 .product(new com.commercetools.api.models.product.ProductReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLProductPresentWithDifferentVariantSelectionErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLProductPresentWithDifferentVariantSelectionErrorTest.java
index 000f5b70dff..a4e8e7a8c32 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLProductPresentWithDifferentVariantSelectionErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLProductPresentWithDifferentVariantSelectionErrorTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLProductPresentWithDifferentVariantSelectionErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLProductPresentWithDifferentVariantSelectionErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLProductPresentWithDifferentVariantSelectionErrorBuilder builder) {
         GraphQLProductPresentWithDifferentVariantSelectionError graphQLProductPresentWithDifferentVariantSelectionError = builder
                 .buildUnchecked();
         Assertions.assertThat(graphQLProductPresentWithDifferentVariantSelectionError)
                 .isInstanceOf(GraphQLProductPresentWithDifferentVariantSelectionError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLProductPresentWithDifferentVariantSelectionError.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { GraphQLProductPresentWithDifferentVariantSelectionError.builder()
+                new Object[] { "product",
+                        GraphQLProductPresentWithDifferentVariantSelectionError.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "existingVariantSelection", GraphQLProductPresentWithDifferentVariantSelectionError
+                        .builder()
                         .existingVariantSelection(
                             new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLProjectNotConfiguredForLanguagesErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLProjectNotConfiguredForLanguagesErrorTest.java
index 524fd4adde1..bf7a80cf577 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLProjectNotConfiguredForLanguagesErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLProjectNotConfiguredForLanguagesErrorTest.java
@@ -3,32 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLProjectNotConfiguredForLanguagesErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLProjectNotConfiguredForLanguagesErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLProjectNotConfiguredForLanguagesErrorBuilder builder) {
         GraphQLProjectNotConfiguredForLanguagesError graphQLProjectNotConfiguredForLanguagesError = builder
                 .buildUnchecked();
         Assertions.assertThat(graphQLProjectNotConfiguredForLanguagesError)
                 .isInstanceOf(GraphQLProjectNotConfiguredForLanguagesError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLProjectNotConfiguredForLanguagesError.builder()
+        return new Object[][] { new Object[] { "languages", GraphQLProjectNotConfiguredForLanguagesError.builder()
                 .languages(Collections.singletonList("languages")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLQueryComplexityLimitExceededErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLQueryComplexityLimitExceededErrorTest.java
index ef803d1a082..3b88bc6a4e6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLQueryComplexityLimitExceededErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLQueryComplexityLimitExceededErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLQueryComplexityLimitExceededErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLQueryTimedOutErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLQueryTimedOutErrorTest.java
index 1007392b9b9..7853c877d91 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLQueryTimedOutErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLQueryTimedOutErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLQueryTimedOutErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLReferenceExistsErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLReferenceExistsErrorTest.java
index ddd7747d11e..f1620f071ed 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLReferenceExistsErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLReferenceExistsErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLReferenceExistsErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLReferenceExistsErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLReferenceExistsErrorBuilder builder) {
         GraphQLReferenceExistsError graphQLReferenceExistsError = builder.buildUnchecked();
         Assertions.assertThat(graphQLReferenceExistsError).isInstanceOf(GraphQLReferenceExistsError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLReferenceExistsError.builder()
+        return new Object[][] { new Object[] { "referencedBy", GraphQLReferenceExistsError.builder()
                 .referencedBy(com.commercetools.api.models.common.ReferenceTypeId.findEnum("approval-flow")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLReferencedResourceNotFoundErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLReferencedResourceNotFoundErrorTest.java
index 6a6d8ec36a3..d4861fe1ab4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLReferencedResourceNotFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLReferencedResourceNotFoundErrorTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLReferencedResourceNotFoundErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLReferencedResourceNotFoundErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLReferencedResourceNotFoundErrorBuilder builder) {
         GraphQLReferencedResourceNotFoundError graphQLReferencedResourceNotFoundError = builder.buildUnchecked();
         Assertions.assertThat(graphQLReferencedResourceNotFoundError)
                 .isInstanceOf(GraphQLReferencedResourceNotFoundError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { GraphQLReferencedResourceNotFoundError.builder()
+                new Object[] { "typeId", GraphQLReferencedResourceNotFoundError.builder()
                         .typeId(com.commercetools.api.models.common.ReferenceTypeId.findEnum("approval-flow")) },
-                new Object[] { GraphQLReferencedResourceNotFoundError.builder().id("id") },
-                new Object[] { GraphQLReferencedResourceNotFoundError.builder().key("key") } };
+                new Object[] { "id", GraphQLReferencedResourceNotFoundError.builder().id("id") },
+                new Object[] { "key", GraphQLReferencedResourceNotFoundError.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLRequiredFieldErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLRequiredFieldErrorTest.java
index 708e89a83cc..7b585f0eb2e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLRequiredFieldErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLRequiredFieldErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLRequiredFieldErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLRequiredFieldErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLRequiredFieldErrorBuilder builder) {
         GraphQLRequiredFieldError graphQLRequiredFieldError = builder.buildUnchecked();
         Assertions.assertThat(graphQLRequiredFieldError).isInstanceOf(GraphQLRequiredFieldError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLRequiredFieldError.builder().field("field") } };
+        return new Object[][] { new Object[] { "field", GraphQLRequiredFieldError.builder().field("field") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLResourceNotFoundErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLResourceNotFoundErrorTest.java
index b1db8b3a4a1..8336687e003 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLResourceNotFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLResourceNotFoundErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLResourceNotFoundErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLResourceSizeLimitExceededErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLResourceSizeLimitExceededErrorTest.java
index 05eaf437d2b..4e51c6a18d3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLResourceSizeLimitExceededErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLResourceSizeLimitExceededErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLResourceSizeLimitExceededErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchDeactivatedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchDeactivatedErrorTest.java
index b7a6d1de800..c3d597eb366 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchDeactivatedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchDeactivatedErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLSearchDeactivatedErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchExecutionFailureErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchExecutionFailureErrorTest.java
index 5f9b373339c..8982c927410 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchExecutionFailureErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchExecutionFailureErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLSearchExecutionFailureErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchFacetPathNotFoundErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchFacetPathNotFoundErrorTest.java
index 2867e8c4912..09189153df6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchFacetPathNotFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchFacetPathNotFoundErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLSearchFacetPathNotFoundErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchIndexingInProgressErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchIndexingInProgressErrorTest.java
index f1e7d50f045..619d59e3cf9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchIndexingInProgressErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchIndexingInProgressErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLSearchIndexingInProgressErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchNotReadyErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchNotReadyErrorTest.java
index 6c780ec38be..f81e2d60d11 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchNotReadyErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSearchNotReadyErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLSearchNotReadyErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSemanticErrorErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSemanticErrorErrorTest.java
index fa62a49ee0b..f1080a7d4d9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSemanticErrorErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSemanticErrorErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLSemanticErrorErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLShippingMethodDoesNotMatchCartErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLShippingMethodDoesNotMatchCartErrorTest.java
index 5e010676b78..93ddd26aefa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLShippingMethodDoesNotMatchCartErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLShippingMethodDoesNotMatchCartErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLShippingMethodDoesNotMatchCartErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLStoreCartDiscountsLimitReachedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLStoreCartDiscountsLimitReachedErrorTest.java
index a97a1cc4d16..cda1b9515da 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLStoreCartDiscountsLimitReachedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLStoreCartDiscountsLimitReachedErrorTest.java
@@ -3,32 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLStoreCartDiscountsLimitReachedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLStoreCartDiscountsLimitReachedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLStoreCartDiscountsLimitReachedErrorBuilder builder) {
         GraphQLStoreCartDiscountsLimitReachedError graphQLStoreCartDiscountsLimitReachedError = builder
                 .buildUnchecked();
         Assertions.assertThat(graphQLStoreCartDiscountsLimitReachedError)
                 .isInstanceOf(GraphQLStoreCartDiscountsLimitReachedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLStoreCartDiscountsLimitReachedError.builder()
+        return new Object[][] { new Object[] { "stores", GraphQLStoreCartDiscountsLimitReachedError.builder()
                 .stores(Collections.singletonList(new com.commercetools.api.models.store.StoreKeyReferenceImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSyntaxErrorErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSyntaxErrorErrorTest.java
index 04962edc954..89f6612c658 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSyntaxErrorErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/GraphQLSyntaxErrorErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLSyntaxErrorErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InsufficientScopeErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InsufficientScopeErrorTest.java
index c01f5c86e2c..b44f6c3b1c4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InsufficientScopeErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InsufficientScopeErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InsufficientScopeErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InsufficientScopeErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InsufficientScopeErrorBuilder builder) {
         InsufficientScopeError insufficientScopeError = builder.buildUnchecked();
         Assertions.assertThat(insufficientScopeError).isInstanceOf(InsufficientScopeError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InsufficientScopeError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", InsufficientScopeError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InternalConstraintViolatedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InternalConstraintViolatedErrorTest.java
index 9967beead42..305e67bb420 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InternalConstraintViolatedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InternalConstraintViolatedErrorTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InternalConstraintViolatedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InternalConstraintViolatedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InternalConstraintViolatedErrorBuilder builder) {
         InternalConstraintViolatedError internalConstraintViolatedError = builder.buildUnchecked();
         Assertions.assertThat(internalConstraintViolatedError).isInstanceOf(InternalConstraintViolatedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InternalConstraintViolatedError.builder().message("message") } };
+        return new Object[][] {
+                new Object[] { "message", InternalConstraintViolatedError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidCredentialsErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidCredentialsErrorTest.java
index 6c621d0cd82..4a10bcce39f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidCredentialsErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidCredentialsErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidCredentialsErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InvalidCredentialsErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InvalidCredentialsErrorBuilder builder) {
         InvalidCredentialsError invalidCredentialsError = builder.buildUnchecked();
         Assertions.assertThat(invalidCredentialsError).isInstanceOf(InvalidCredentialsError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InvalidCredentialsError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", InvalidCredentialsError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidCurrentPasswordErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidCurrentPasswordErrorTest.java
index 6c722714e77..87dfbc51230 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidCurrentPasswordErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidCurrentPasswordErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidCurrentPasswordErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InvalidCurrentPasswordErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InvalidCurrentPasswordErrorBuilder builder) {
         InvalidCurrentPasswordError invalidCurrentPasswordError = builder.buildUnchecked();
         Assertions.assertThat(invalidCurrentPasswordError).isInstanceOf(InvalidCurrentPasswordError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InvalidCurrentPasswordError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", InvalidCurrentPasswordError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidFieldErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidFieldErrorTest.java
index af5016fb19c..c633c9d468b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidFieldErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidFieldErrorTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidFieldErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InvalidFieldErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InvalidFieldErrorBuilder builder) {
         InvalidFieldError invalidFieldError = builder.buildUnchecked();
         Assertions.assertThat(invalidFieldError).isInstanceOf(InvalidFieldError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InvalidFieldError.builder().message("message") },
-                new Object[] { InvalidFieldError.builder().field("field") },
-                new Object[] { InvalidFieldError.builder().invalidValue("invalidValue") }, new Object[] {
+        return new Object[][] { new Object[] { "message", InvalidFieldError.builder().message("message") },
+                new Object[] { "field", InvalidFieldError.builder().field("field") },
+                new Object[] { "invalidValue", InvalidFieldError.builder().invalidValue("invalidValue") },
+                new Object[] { "allowedValues",
                         InvalidFieldError.builder().allowedValues(Collections.singletonList("allowedValues")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidInputErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidInputErrorTest.java
index 1b491bbdfa3..f6d4e0a4788 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidInputErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidInputErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidInputErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InvalidInputErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InvalidInputErrorBuilder builder) {
         InvalidInputError invalidInputError = builder.buildUnchecked();
         Assertions.assertThat(invalidInputError).isInstanceOf(InvalidInputError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InvalidInputError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", InvalidInputError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidItemShippingDetailsErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidItemShippingDetailsErrorTest.java
index 6212fd2f7c7..3a762526226 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidItemShippingDetailsErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidItemShippingDetailsErrorTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidItemShippingDetailsErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InvalidItemShippingDetailsErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InvalidItemShippingDetailsErrorBuilder builder) {
         InvalidItemShippingDetailsError invalidItemShippingDetailsError = builder.buildUnchecked();
         Assertions.assertThat(invalidItemShippingDetailsError).isInstanceOf(InvalidItemShippingDetailsError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InvalidItemShippingDetailsError.builder().message("message") },
-                new Object[] { InvalidItemShippingDetailsError.builder().subject("subject") },
-                new Object[] { InvalidItemShippingDetailsError.builder().itemId("itemId") } };
+        return new Object[][] {
+                new Object[] { "message", InvalidItemShippingDetailsError.builder().message("message") },
+                new Object[] { "subject", InvalidItemShippingDetailsError.builder().subject("subject") },
+                new Object[] { "itemId", InvalidItemShippingDetailsError.builder().itemId("itemId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidJsonInputErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidJsonInputErrorTest.java
index dcff8f54ca1..35d6f6c735b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidJsonInputErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidJsonInputErrorTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidJsonInputErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InvalidJsonInputErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InvalidJsonInputErrorBuilder builder) {
         InvalidJsonInputError invalidJsonInputError = builder.buildUnchecked();
         Assertions.assertThat(invalidJsonInputError).isInstanceOf(InvalidJsonInputError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InvalidJsonInputError.builder().message("message") },
-                new Object[] { InvalidJsonInputError.builder().detailedErrorMessage("detailedErrorMessage") } };
+        return new Object[][] { new Object[] { "message", InvalidJsonInputError.builder().message("message") },
+                new Object[] { "detailedErrorMessage",
+                        InvalidJsonInputError.builder().detailedErrorMessage("detailedErrorMessage") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidOperationErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidOperationErrorTest.java
index c6c7f096c7e..6e1af9d0903 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidOperationErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidOperationErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidOperationErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InvalidOperationErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InvalidOperationErrorBuilder builder) {
         InvalidOperationError invalidOperationError = builder.buildUnchecked();
         Assertions.assertThat(invalidOperationError).isInstanceOf(InvalidOperationError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InvalidOperationError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", InvalidOperationError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidSubjectErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidSubjectErrorTest.java
index 0624768fc5d..bf4a450d901 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidSubjectErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidSubjectErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidSubjectErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidTokenErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidTokenErrorTest.java
index 4556c38ec00..e02be34cd04 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidTokenErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/InvalidTokenErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidTokenErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/LanguageUsedInStoresErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/LanguageUsedInStoresErrorTest.java
index ee811485154..7d832462cf4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/LanguageUsedInStoresErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/LanguageUsedInStoresErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LanguageUsedInStoresErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LanguageUsedInStoresErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LanguageUsedInStoresErrorBuilder builder) {
         LanguageUsedInStoresError languageUsedInStoresError = builder.buildUnchecked();
         Assertions.assertThat(languageUsedInStoresError).isInstanceOf(LanguageUsedInStoresError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LanguageUsedInStoresError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", LanguageUsedInStoresError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/LockedFieldErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/LockedFieldErrorTest.java
index 0192f4ea342..19690cf4b44 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/LockedFieldErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/LockedFieldErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LockedFieldErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LockedFieldErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LockedFieldErrorBuilder builder) {
         LockedFieldError lockedFieldError = builder.buildUnchecked();
         Assertions.assertThat(lockedFieldError).isInstanceOf(LockedFieldError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LockedFieldError.builder().field("field") },
-                new Object[] { LockedFieldError.builder().message("message") } };
+        return new Object[][] { new Object[] { "field", LockedFieldError.builder().field("field") },
+                new Object[] { "message", LockedFieldError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MatchingPriceNotFoundErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MatchingPriceNotFoundErrorTest.java
index 29f7a850b15..8f024a08270 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MatchingPriceNotFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MatchingPriceNotFoundErrorTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MatchingPriceNotFoundErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MatchingPriceNotFoundErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MatchingPriceNotFoundErrorBuilder builder) {
         MatchingPriceNotFoundError matchingPriceNotFoundError = builder.buildUnchecked();
         Assertions.assertThat(matchingPriceNotFoundError).isInstanceOf(MatchingPriceNotFoundError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MatchingPriceNotFoundError.builder().message("message") },
-                new Object[] { MatchingPriceNotFoundError.builder().productId("productId") },
-                new Object[] { MatchingPriceNotFoundError.builder().variantId(5) },
-                new Object[] { MatchingPriceNotFoundError.builder().currency("currency") },
-                new Object[] { MatchingPriceNotFoundError.builder().country("country") },
-                new Object[] { MatchingPriceNotFoundError.builder()
+        return new Object[][] { new Object[] { "message", MatchingPriceNotFoundError.builder().message("message") },
+                new Object[] { "productId", MatchingPriceNotFoundError.builder().productId("productId") },
+                new Object[] { "variantId", MatchingPriceNotFoundError.builder().variantId(5) },
+                new Object[] { "currency", MatchingPriceNotFoundError.builder().currency("currency") },
+                new Object[] { "country", MatchingPriceNotFoundError.builder().country("country") },
+                new Object[] { "customerGroup", MatchingPriceNotFoundError.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] { MatchingPriceNotFoundError.builder()
+                new Object[] { "channel", MatchingPriceNotFoundError.builder()
                         .channel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MaxCartDiscountsReachedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MaxCartDiscountsReachedErrorTest.java
index 62bfa64c552..78cdda3d2b7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MaxCartDiscountsReachedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MaxCartDiscountsReachedErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MaxCartDiscountsReachedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MaxCartDiscountsReachedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MaxCartDiscountsReachedErrorBuilder builder) {
         MaxCartDiscountsReachedError maxCartDiscountsReachedError = builder.buildUnchecked();
         Assertions.assertThat(maxCartDiscountsReachedError).isInstanceOf(MaxCartDiscountsReachedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MaxCartDiscountsReachedError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", MaxCartDiscountsReachedError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MaxResourceLimitExceededErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MaxResourceLimitExceededErrorTest.java
index bf7dbd0c59a..a673e4acad3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MaxResourceLimitExceededErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MaxResourceLimitExceededErrorTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MaxResourceLimitExceededErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MaxResourceLimitExceededErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MaxResourceLimitExceededErrorBuilder builder) {
         MaxResourceLimitExceededError maxResourceLimitExceededError = builder.buildUnchecked();
         Assertions.assertThat(maxResourceLimitExceededError).isInstanceOf(MaxResourceLimitExceededError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MaxResourceLimitExceededError.builder().message("message") },
-                new Object[] { MaxResourceLimitExceededError.builder()
-                        .exceededResource(
-                            com.commercetools.api.models.common.ReferenceTypeId.findEnum("approval-flow")) } };
+        return new Object[][] { new Object[] { "message", MaxResourceLimitExceededError.builder().message("message") },
+                new Object[] { "exceededResource",
+                        MaxResourceLimitExceededError.builder()
+                                .exceededResource(
+                                    com.commercetools.api.models.common.ReferenceTypeId.findEnum("approval-flow")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MaxStoreReferencesReachedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MaxStoreReferencesReachedErrorTest.java
index 800df8a9e17..8ee7df5f7d0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MaxStoreReferencesReachedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MaxStoreReferencesReachedErrorTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MaxStoreReferencesReachedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MaxStoreReferencesReachedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MaxStoreReferencesReachedErrorBuilder builder) {
         MaxStoreReferencesReachedError maxStoreReferencesReachedError = builder.buildUnchecked();
         Assertions.assertThat(maxStoreReferencesReachedError).isInstanceOf(MaxStoreReferencesReachedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MaxStoreReferencesReachedError.builder().message("message") } };
+        return new Object[][] {
+                new Object[] { "message", MaxStoreReferencesReachedError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MissingRoleOnChannelErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MissingRoleOnChannelErrorTest.java
index c703c407118..3097bd68684 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MissingRoleOnChannelErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MissingRoleOnChannelErrorTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MissingRoleOnChannelErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MissingRoleOnChannelErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MissingRoleOnChannelErrorBuilder builder) {
         MissingRoleOnChannelError missingRoleOnChannelError = builder.buildUnchecked();
         Assertions.assertThat(missingRoleOnChannelError).isInstanceOf(MissingRoleOnChannelError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MissingRoleOnChannelError.builder().message("message") },
-                new Object[] { MissingRoleOnChannelError.builder()
-                        .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { MissingRoleOnChannelError.builder()
+        return new Object[][] { new Object[] { "message", MissingRoleOnChannelError.builder().message("message") },
+                new Object[] { "channel",
+                        MissingRoleOnChannelError.builder()
+                                .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "missingRole", MissingRoleOnChannelError.builder()
                         .missingRole(
                             com.commercetools.api.models.channel.ChannelRoleEnum.findEnum("InventorySupply")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MissingTaxRateForCountryErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MissingTaxRateForCountryErrorTest.java
index caa40a96318..7a0be50fac4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MissingTaxRateForCountryErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MissingTaxRateForCountryErrorTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MissingTaxRateForCountryErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MissingTaxRateForCountryErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MissingTaxRateForCountryErrorBuilder builder) {
         MissingTaxRateForCountryError missingTaxRateForCountryError = builder.buildUnchecked();
         Assertions.assertThat(missingTaxRateForCountryError).isInstanceOf(MissingTaxRateForCountryError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MissingTaxRateForCountryError.builder().message("message") },
-                new Object[] { MissingTaxRateForCountryError.builder().taxCategoryId("taxCategoryId") },
-                new Object[] { MissingTaxRateForCountryError.builder().country("country") },
-                new Object[] { MissingTaxRateForCountryError.builder().state("state") } };
+        return new Object[][] { new Object[] { "message", MissingTaxRateForCountryError.builder().message("message") },
+                new Object[] { "taxCategoryId",
+                        MissingTaxRateForCountryError.builder().taxCategoryId("taxCategoryId") },
+                new Object[] { "country", MissingTaxRateForCountryError.builder().country("country") },
+                new Object[] { "state", MissingTaxRateForCountryError.builder().state("state") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MoneyOverflowErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MoneyOverflowErrorTest.java
index 82083ec3946..ddf63c4f9b9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MoneyOverflowErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/MoneyOverflowErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MoneyOverflowErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MoneyOverflowErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MoneyOverflowErrorBuilder builder) {
         MoneyOverflowError moneyOverflowError = builder.buildUnchecked();
         Assertions.assertThat(moneyOverflowError).isInstanceOf(MoneyOverflowError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MoneyOverflowError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", MoneyOverflowError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/NoMatchingProductDiscountFoundErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/NoMatchingProductDiscountFoundErrorTest.java
index 2c309661a65..0c6c9cb90c4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/NoMatchingProductDiscountFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/NoMatchingProductDiscountFoundErrorTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class NoMatchingProductDiscountFoundErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(NoMatchingProductDiscountFoundErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, NoMatchingProductDiscountFoundErrorBuilder builder) {
         NoMatchingProductDiscountFoundError noMatchingProductDiscountFoundError = builder.buildUnchecked();
         Assertions.assertThat(noMatchingProductDiscountFoundError)
                 .isInstanceOf(NoMatchingProductDiscountFoundError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { NoMatchingProductDiscountFoundError.builder().message("message") } };
+        return new Object[][] {
+                new Object[] { "message", NoMatchingProductDiscountFoundError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ObjectNotFoundErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ObjectNotFoundErrorTest.java
index 0d00d993238..117292c8973 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ObjectNotFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ObjectNotFoundErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ObjectNotFoundErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ObjectNotFoundErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ObjectNotFoundErrorBuilder builder) {
         ObjectNotFoundError objectNotFoundError = builder.buildUnchecked();
         Assertions.assertThat(objectNotFoundError).isInstanceOf(ObjectNotFoundError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ObjectNotFoundError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", ObjectNotFoundError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/OutOfStockErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/OutOfStockErrorTest.java
index b5e5a788ed0..b3a3ead7144 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/OutOfStockErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/OutOfStockErrorTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OutOfStockErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OutOfStockErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OutOfStockErrorBuilder builder) {
         OutOfStockError outOfStockError = builder.buildUnchecked();
         Assertions.assertThat(outOfStockError).isInstanceOf(OutOfStockError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OutOfStockError.builder().message("message") },
-                new Object[] { OutOfStockError.builder().lineItems(Collections.singletonList("lineItems")) },
-                new Object[] { OutOfStockError.builder().skus(Collections.singletonList("skus")) } };
+        return new Object[][] { new Object[] { "message", OutOfStockError.builder().message("message") },
+                new Object[] { "lineItems",
+                        OutOfStockError.builder().lineItems(Collections.singletonList("lineItems")) },
+                new Object[] { "skus", OutOfStockError.builder().skus(Collections.singletonList("skus")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/OverCapacityErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/OverCapacityErrorTest.java
index 86cde4c73f9..9d4ed95b1ce 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/OverCapacityErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/OverCapacityErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OverCapacityErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OverCapacityErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OverCapacityErrorBuilder builder) {
         OverCapacityError overCapacityError = builder.buildUnchecked();
         Assertions.assertThat(overCapacityError).isInstanceOf(OverCapacityError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OverCapacityError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", OverCapacityError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/OverlappingStandalonePriceValidityErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/OverlappingStandalonePriceValidityErrorTest.java
index 785a711fff3..edf8f2052e4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/OverlappingStandalonePriceValidityErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/OverlappingStandalonePriceValidityErrorTest.java
@@ -3,49 +3,47 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OverlappingStandalonePriceValidityErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OverlappingStandalonePriceValidityErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OverlappingStandalonePriceValidityErrorBuilder builder) {
         OverlappingStandalonePriceValidityError overlappingStandalonePriceValidityError = builder.buildUnchecked();
         Assertions.assertThat(overlappingStandalonePriceValidityError)
                 .isInstanceOf(OverlappingStandalonePriceValidityError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OverlappingStandalonePriceValidityError.builder().message("message") },
-                new Object[] { OverlappingStandalonePriceValidityError.builder()
-                        .conflictingStandalonePrice(
-                            new com.commercetools.api.models.standalone_price.StandalonePriceReferenceImpl()) },
-                new Object[] { OverlappingStandalonePriceValidityError.builder().sku("sku") },
-                new Object[] { OverlappingStandalonePriceValidityError.builder().currency("currency") },
-                new Object[] { OverlappingStandalonePriceValidityError.builder().country("country") },
-                new Object[] { OverlappingStandalonePriceValidityError.builder()
+        return new Object[][] {
+                new Object[] { "message", OverlappingStandalonePriceValidityError.builder().message("message") },
+                new Object[] { "conflictingStandalonePrice",
+                        OverlappingStandalonePriceValidityError.builder()
+                                .conflictingStandalonePrice(
+                                    new com.commercetools.api.models.standalone_price.StandalonePriceReferenceImpl()) },
+                new Object[] { "sku", OverlappingStandalonePriceValidityError.builder().sku("sku") },
+                new Object[] { "currency", OverlappingStandalonePriceValidityError.builder().currency("currency") },
+                new Object[] { "country", OverlappingStandalonePriceValidityError.builder().country("country") },
+                new Object[] { "customerGroup", OverlappingStandalonePriceValidityError.builder()
                         .customerGroup(
                             new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) },
-                new Object[] { OverlappingStandalonePriceValidityError.builder()
-                        .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { OverlappingStandalonePriceValidityError.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { OverlappingStandalonePriceValidityError.builder()
-                        .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { OverlappingStandalonePriceValidityError.builder()
-                        .conflictingValidFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { OverlappingStandalonePriceValidityError.builder()
+                new Object[] { "channel",
+                        OverlappingStandalonePriceValidityError.builder()
+                                .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "validFrom",
+                        OverlappingStandalonePriceValidityError.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        OverlappingStandalonePriceValidityError.builder()
+                                .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "conflictingValidFrom",
+                        OverlappingStandalonePriceValidityError.builder()
+                                .conflictingValidFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "conflictingValidUntil", OverlappingStandalonePriceValidityError.builder()
                         .conflictingValidUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/PendingOperationErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/PendingOperationErrorTest.java
index 2651ce204ae..55e4fd83404 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/PendingOperationErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/PendingOperationErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PendingOperationErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PendingOperationErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PendingOperationErrorBuilder builder) {
         PendingOperationError pendingOperationError = builder.buildUnchecked();
         Assertions.assertThat(pendingOperationError).isInstanceOf(PendingOperationError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PendingOperationError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", PendingOperationError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/PriceChangedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/PriceChangedErrorTest.java
index da81bd732b0..e87b35ef988 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/PriceChangedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/PriceChangedErrorTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PriceChangedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PriceChangedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PriceChangedErrorBuilder builder) {
         PriceChangedError priceChangedError = builder.buildUnchecked();
         Assertions.assertThat(priceChangedError).isInstanceOf(PriceChangedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PriceChangedError.builder().message("message") },
-                new Object[] { PriceChangedError.builder().lineItems(Collections.singletonList("lineItems")) },
-                new Object[] { PriceChangedError.builder().shipping(true) } };
+        return new Object[][] { new Object[] { "message", PriceChangedError.builder().message("message") },
+                new Object[] { "lineItems",
+                        PriceChangedError.builder().lineItems(Collections.singletonList("lineItems")) },
+                new Object[] { "shipping", PriceChangedError.builder().shipping(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ProductAssignmentMissingErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ProductAssignmentMissingErrorTest.java
index 66528231445..84bf4d7db06 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ProductAssignmentMissingErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ProductAssignmentMissingErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductAssignmentMissingErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductAssignmentMissingErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductAssignmentMissingErrorBuilder builder) {
         ProductAssignmentMissingError productAssignmentMissingError = builder.buildUnchecked();
         Assertions.assertThat(productAssignmentMissingError).isInstanceOf(ProductAssignmentMissingError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductAssignmentMissingError.builder().message("message") },
-                new Object[] { ProductAssignmentMissingError.builder()
+        return new Object[][] { new Object[] { "message", ProductAssignmentMissingError.builder().message("message") },
+                new Object[] { "product", ProductAssignmentMissingError.builder()
                         .product(new com.commercetools.api.models.product.ProductReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ProductPresentWithDifferentVariantSelectionErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ProductPresentWithDifferentVariantSelectionErrorTest.java
index a653ff6dd28..ccb448ddb28 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ProductPresentWithDifferentVariantSelectionErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ProductPresentWithDifferentVariantSelectionErrorTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPresentWithDifferentVariantSelectionErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPresentWithDifferentVariantSelectionErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPresentWithDifferentVariantSelectionErrorBuilder builder) {
         ProductPresentWithDifferentVariantSelectionError productPresentWithDifferentVariantSelectionError = builder
                 .buildUnchecked();
         Assertions.assertThat(productPresentWithDifferentVariantSelectionError)
                 .isInstanceOf(ProductPresentWithDifferentVariantSelectionError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductPresentWithDifferentVariantSelectionError.builder().message("message") },
-                new Object[] { ProductPresentWithDifferentVariantSelectionError.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductPresentWithDifferentVariantSelectionError.builder()
+                new Object[] { "message",
+                        ProductPresentWithDifferentVariantSelectionError.builder().message("message") },
+                new Object[] { "product",
+                        ProductPresentWithDifferentVariantSelectionError.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "existingVariantSelection", ProductPresentWithDifferentVariantSelectionError.builder()
                         .existingVariantSelection(
                             new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ProjectNotConfiguredForLanguagesErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ProjectNotConfiguredForLanguagesErrorTest.java
index 533aae99cde..5ffbbc0b6d7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ProjectNotConfiguredForLanguagesErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ProjectNotConfiguredForLanguagesErrorTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectNotConfiguredForLanguagesErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectNotConfiguredForLanguagesErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectNotConfiguredForLanguagesErrorBuilder builder) {
         ProjectNotConfiguredForLanguagesError projectNotConfiguredForLanguagesError = builder.buildUnchecked();
         Assertions.assertThat(projectNotConfiguredForLanguagesError)
                 .isInstanceOf(ProjectNotConfiguredForLanguagesError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectNotConfiguredForLanguagesError.builder().message("message") },
-                new Object[] { ProjectNotConfiguredForLanguagesError.builder()
+        return new Object[][] {
+                new Object[] { "message", ProjectNotConfiguredForLanguagesError.builder().message("message") },
+                new Object[] { "languages", ProjectNotConfiguredForLanguagesError.builder()
                         .languages(Collections.singletonList("languages")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/QueryComplexityLimitExceededErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/QueryComplexityLimitExceededErrorTest.java
index ed3570e114c..770a7d03095 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/QueryComplexityLimitExceededErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/QueryComplexityLimitExceededErrorTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QueryComplexityLimitExceededErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QueryComplexityLimitExceededErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QueryComplexityLimitExceededErrorBuilder builder) {
         QueryComplexityLimitExceededError queryComplexityLimitExceededError = builder.buildUnchecked();
         Assertions.assertThat(queryComplexityLimitExceededError).isInstanceOf(QueryComplexityLimitExceededError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QueryComplexityLimitExceededError.builder().message("message") } };
+        return new Object[][] {
+                new Object[] { "message", QueryComplexityLimitExceededError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/QueryTimedOutErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/QueryTimedOutErrorTest.java
index 36b9edf3f81..67652d741e1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/QueryTimedOutErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/QueryTimedOutErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QueryTimedOutErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QueryTimedOutErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QueryTimedOutErrorBuilder builder) {
         QueryTimedOutError queryTimedOutError = builder.buildUnchecked();
         Assertions.assertThat(queryTimedOutError).isInstanceOf(QueryTimedOutError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QueryTimedOutError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", QueryTimedOutError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ReferenceExistsErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ReferenceExistsErrorTest.java
index 605a97513cd..45104c73587 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ReferenceExistsErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ReferenceExistsErrorTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReferenceExistsErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReferenceExistsErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReferenceExistsErrorBuilder builder) {
         ReferenceExistsError referenceExistsError = builder.buildUnchecked();
         Assertions.assertThat(referenceExistsError).isInstanceOf(ReferenceExistsError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReferenceExistsError.builder().message("message") },
-                new Object[] { ReferenceExistsError.builder()
-                        .referencedBy(
-                            com.commercetools.api.models.common.ReferenceTypeId.findEnum("approval-flow")) } };
+        return new Object[][] { new Object[] { "message", ReferenceExistsError.builder().message("message") },
+                new Object[] { "referencedBy",
+                        ReferenceExistsError.builder()
+                                .referencedBy(
+                                    com.commercetools.api.models.common.ReferenceTypeId.findEnum("approval-flow")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ReferencedResourceNotFoundErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ReferencedResourceNotFoundErrorTest.java
index 91c64d612dc..8f31edbc9e7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ReferencedResourceNotFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ReferencedResourceNotFoundErrorTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReferencedResourceNotFoundErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReferencedResourceNotFoundErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReferencedResourceNotFoundErrorBuilder builder) {
         ReferencedResourceNotFoundError referencedResourceNotFoundError = builder.buildUnchecked();
         Assertions.assertThat(referencedResourceNotFoundError).isInstanceOf(ReferencedResourceNotFoundError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReferencedResourceNotFoundError.builder().message("message") },
-                new Object[] { ReferencedResourceNotFoundError.builder()
+        return new Object[][] {
+                new Object[] { "message", ReferencedResourceNotFoundError.builder().message("message") },
+                new Object[] { "typeId", ReferencedResourceNotFoundError.builder()
                         .typeId(com.commercetools.api.models.common.ReferenceTypeId.findEnum("approval-flow")) },
-                new Object[] { ReferencedResourceNotFoundError.builder().id("id") },
-                new Object[] { ReferencedResourceNotFoundError.builder().key("key") } };
+                new Object[] { "id", ReferencedResourceNotFoundError.builder().id("id") },
+                new Object[] { "key", ReferencedResourceNotFoundError.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/RequiredFieldErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/RequiredFieldErrorTest.java
index 685736e2618..584d6c2dc7d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/RequiredFieldErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/RequiredFieldErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RequiredFieldErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RequiredFieldErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RequiredFieldErrorBuilder builder) {
         RequiredFieldError requiredFieldError = builder.buildUnchecked();
         Assertions.assertThat(requiredFieldError).isInstanceOf(RequiredFieldError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RequiredFieldError.builder().message("message") },
-                new Object[] { RequiredFieldError.builder().field("field") } };
+        return new Object[][] { new Object[] { "message", RequiredFieldError.builder().message("message") },
+                new Object[] { "field", RequiredFieldError.builder().field("field") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ResourceNotFoundErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ResourceNotFoundErrorTest.java
index 36b15d47f39..4c6bf3cc1b7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ResourceNotFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ResourceNotFoundErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ResourceNotFoundErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ResourceNotFoundErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ResourceNotFoundErrorBuilder builder) {
         ResourceNotFoundError resourceNotFoundError = builder.buildUnchecked();
         Assertions.assertThat(resourceNotFoundError).isInstanceOf(ResourceNotFoundError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ResourceNotFoundError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", ResourceNotFoundError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ResourceSizeLimitExceededErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ResourceSizeLimitExceededErrorTest.java
index 72f3b4b4501..0f8c8993340 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ResourceSizeLimitExceededErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ResourceSizeLimitExceededErrorTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ResourceSizeLimitExceededErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ResourceSizeLimitExceededErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ResourceSizeLimitExceededErrorBuilder builder) {
         ResourceSizeLimitExceededError resourceSizeLimitExceededError = builder.buildUnchecked();
         Assertions.assertThat(resourceSizeLimitExceededError).isInstanceOf(ResourceSizeLimitExceededError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ResourceSizeLimitExceededError.builder().message("message") } };
+        return new Object[][] {
+                new Object[] { "message", ResourceSizeLimitExceededError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchDeactivatedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchDeactivatedErrorTest.java
index d640e9a2ffc..180511b7b2f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchDeactivatedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchDeactivatedErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchDeactivatedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchDeactivatedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchDeactivatedErrorBuilder builder) {
         SearchDeactivatedError searchDeactivatedError = builder.buildUnchecked();
         Assertions.assertThat(searchDeactivatedError).isInstanceOf(SearchDeactivatedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchDeactivatedError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", SearchDeactivatedError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchExecutionFailureErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchExecutionFailureErrorTest.java
index f2cbb225a6b..827af7fd897 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchExecutionFailureErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchExecutionFailureErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchExecutionFailureErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchExecutionFailureErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchExecutionFailureErrorBuilder builder) {
         SearchExecutionFailureError searchExecutionFailureError = builder.buildUnchecked();
         Assertions.assertThat(searchExecutionFailureError).isInstanceOf(SearchExecutionFailureError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchExecutionFailureError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", SearchExecutionFailureError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchFacetPathNotFoundErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchFacetPathNotFoundErrorTest.java
index 823d356f76b..a71441e265f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchFacetPathNotFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchFacetPathNotFoundErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchFacetPathNotFoundErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchFacetPathNotFoundErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchFacetPathNotFoundErrorBuilder builder) {
         SearchFacetPathNotFoundError searchFacetPathNotFoundError = builder.buildUnchecked();
         Assertions.assertThat(searchFacetPathNotFoundError).isInstanceOf(SearchFacetPathNotFoundError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchFacetPathNotFoundError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", SearchFacetPathNotFoundError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchIndexingInProgressErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchIndexingInProgressErrorTest.java
index e12be289499..ac85db27f6e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchIndexingInProgressErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchIndexingInProgressErrorTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchIndexingInProgressErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchIndexingInProgressErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchIndexingInProgressErrorBuilder builder) {
         SearchIndexingInProgressError searchIndexingInProgressError = builder.buildUnchecked();
         Assertions.assertThat(searchIndexingInProgressError).isInstanceOf(SearchIndexingInProgressError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchIndexingInProgressError.builder().message("message") } };
+        return new Object[][] {
+                new Object[] { "message", SearchIndexingInProgressError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchNotReadyErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchNotReadyErrorTest.java
index 5395d67c849..3ca5dcb36a5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchNotReadyErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SearchNotReadyErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchNotReadyErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchNotReadyErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchNotReadyErrorBuilder builder) {
         SearchNotReadyError searchNotReadyError = builder.buildUnchecked();
         Assertions.assertThat(searchNotReadyError).isInstanceOf(SearchNotReadyError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchNotReadyError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", SearchNotReadyError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SemanticErrorErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SemanticErrorErrorTest.java
index 5ebb79bb412..9dec9ff0d03 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SemanticErrorErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SemanticErrorErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SemanticErrorErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SemanticErrorErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SemanticErrorErrorBuilder builder) {
         SemanticErrorError semanticErrorError = builder.buildUnchecked();
         Assertions.assertThat(semanticErrorError).isInstanceOf(SemanticErrorError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SemanticErrorError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", SemanticErrorError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ShippingMethodDoesNotMatchCartErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ShippingMethodDoesNotMatchCartErrorTest.java
index b6cf9548cb9..11198859554 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ShippingMethodDoesNotMatchCartErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/ShippingMethodDoesNotMatchCartErrorTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodDoesNotMatchCartErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodDoesNotMatchCartErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodDoesNotMatchCartErrorBuilder builder) {
         ShippingMethodDoesNotMatchCartError shippingMethodDoesNotMatchCartError = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodDoesNotMatchCartError)
                 .isInstanceOf(ShippingMethodDoesNotMatchCartError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodDoesNotMatchCartError.builder().message("message") } };
+        return new Object[][] {
+                new Object[] { "message", ShippingMethodDoesNotMatchCartError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/StoreCartDiscountsLimitReachedErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/StoreCartDiscountsLimitReachedErrorTest.java
index ac654dad370..fe857fd0c88 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/StoreCartDiscountsLimitReachedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/StoreCartDiscountsLimitReachedErrorTest.java
@@ -3,34 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreCartDiscountsLimitReachedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreCartDiscountsLimitReachedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreCartDiscountsLimitReachedErrorBuilder builder) {
         StoreCartDiscountsLimitReachedError storeCartDiscountsLimitReachedError = builder.buildUnchecked();
         Assertions.assertThat(storeCartDiscountsLimitReachedError)
                 .isInstanceOf(StoreCartDiscountsLimitReachedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreCartDiscountsLimitReachedError.builder().message("message") },
-                new Object[] { StoreCartDiscountsLimitReachedError.builder()
-                        .stores(Collections
-                                .singletonList(new com.commercetools.api.models.store.StoreKeyReferenceImpl())) } };
+        return new Object[][] {
+                new Object[] { "message", StoreCartDiscountsLimitReachedError.builder().message("message") },
+                new Object[] { "stores",
+                        StoreCartDiscountsLimitReachedError.builder()
+                                .stores(Collections.singletonList(
+                                    new com.commercetools.api.models.store.StoreKeyReferenceImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SyntaxErrorErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SyntaxErrorErrorTest.java
index cb2e8de33d3..89692bc4e4e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SyntaxErrorErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/SyntaxErrorErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.error;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SyntaxErrorErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SyntaxErrorErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SyntaxErrorErrorBuilder builder) {
         SyntaxErrorError syntaxErrorError = builder.buildUnchecked();
         Assertions.assertThat(syntaxErrorError).isInstanceOf(SyntaxErrorError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SyntaxErrorError.builder().message("message") } };
+        return new Object[][] { new Object[] { "message", SyntaxErrorError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/VariantValuesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/VariantValuesTest.java
index 028d0f46748..5998eaf3360 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/VariantValuesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/error/VariantValuesTest.java
@@ -3,33 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class VariantValuesTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(VariantValuesBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, VariantValuesBuilder builder) {
         VariantValues variantValues = builder.buildUnchecked();
         Assertions.assertThat(variantValues).isInstanceOf(VariantValues.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { VariantValues.builder().sku("sku") },
-                new Object[] { VariantValues.builder()
+        return new Object[][] { new Object[] { "sku", VariantValues.builder().sku("sku") }, new Object[] { "prices",
+                VariantValues.builder()
                         .prices(Collections.singletonList(new com.commercetools.api.models.common.PriceDraftImpl())) },
-                new Object[] { VariantValues.builder()
+                new Object[] { "attributes", VariantValues.builder()
                         .attributes(
                             Collections.singletonList(new com.commercetools.api.models.product.AttributeImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/BaseEventTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/BaseEventTest.java
index 36a9e0c3624..62d8f4b5f1b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/BaseEventTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/BaseEventTest.java
@@ -3,38 +3,33 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BaseEventTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BaseEventBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BaseEventBuilder builder) {
         BaseEvent baseEvent = builder.buildUnchecked();
         Assertions.assertThat(baseEvent).isInstanceOf(BaseEvent.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BaseEvent.builder().id("id") },
-                new Object[] { BaseEvent.builder().notificationType("notificationType") },
-                new Object[] { BaseEvent.builder()
-                        .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
-                                .findEnum("import-api")) },
-                new Object[] { BaseEvent.builder()
-                        .type(com.commercetools.api.models.subscription.EventType.findEnum("ImportContainerCreated")) },
-                new Object[] { BaseEvent.builder().data("data") },
-                new Object[] { BaseEvent.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+        return new Object[][] { new Object[] { "id", BaseEvent.builder().id("id") },
+                new Object[] { "notificationType", BaseEvent.builder().notificationType("notificationType") },
+                new Object[] { "resourceType",
+                        BaseEvent.builder()
+                                .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
+                                        .findEnum("import-api")) },
+                new Object[] { "type",
+                        BaseEvent.builder()
+                                .type(com.commercetools.api.models.subscription.EventType
+                                        .findEnum("ImportContainerCreated")) },
+                new Object[] { "data", BaseEvent.builder().data("data") },
+                new Object[] { "createdAt", BaseEvent.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerCreatedEventDataTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerCreatedEventDataTest.java
index 2e8513e0a78..e952b05e22b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerCreatedEventDataTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerCreatedEventDataTest.java
@@ -3,34 +3,26 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportContainerCreatedEventDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportContainerCreatedEventDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportContainerCreatedEventDataBuilder builder) {
         ImportContainerCreatedEventData importContainerCreatedEventData = builder.buildUnchecked();
         Assertions.assertThat(importContainerCreatedEventData).isInstanceOf(ImportContainerCreatedEventData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportContainerCreatedEventData.builder().key("key") },
-                new Object[] { ImportContainerCreatedEventData.builder().version(2) },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", ImportContainerCreatedEventData.builder().key("key") },
+                new Object[] { "version", ImportContainerCreatedEventData.builder().version(2) },
+                new Object[] { "createdAt",
                         ImportContainerCreatedEventData.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ImportContainerCreatedEventData.builder()
+                new Object[] { "lastModifiedAt", ImportContainerCreatedEventData.builder()
                         .lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerCreatedEventTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerCreatedEventTest.java
index 0ee2e9bb651..1e9f08df1e7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerCreatedEventTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerCreatedEventTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.event;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportContainerCreatedEventTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportContainerCreatedEventBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportContainerCreatedEventBuilder builder) {
         ImportContainerCreatedEvent importContainerCreatedEvent = builder.buildUnchecked();
         Assertions.assertThat(importContainerCreatedEvent).isInstanceOf(ImportContainerCreatedEvent.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ImportContainerCreatedEvent.builder()
-                        .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
-                                .findEnum("import-api")) },
-                new Object[] { ImportContainerCreatedEvent.builder()
+                new Object[] { "resourceType",
+                        ImportContainerCreatedEvent.builder()
+                                .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
+                                        .findEnum("import-api")) },
+                new Object[] { "data", ImportContainerCreatedEvent.builder()
                         .data(new com.commercetools.api.models.event.ImportContainerCreatedEventDataImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerDeletedEventDataTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerDeletedEventDataTest.java
index 47f5f33aea1..f142b6c238b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerDeletedEventDataTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerDeletedEventDataTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.event;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportContainerDeletedEventDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportContainerDeletedEventDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportContainerDeletedEventDataBuilder builder) {
         ImportContainerDeletedEventData importContainerDeletedEventData = builder.buildUnchecked();
         Assertions.assertThat(importContainerDeletedEventData).isInstanceOf(ImportContainerDeletedEventData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportContainerDeletedEventData.builder().key("key") },
-                new Object[] { ImportContainerDeletedEventData.builder().version(2) } };
+        return new Object[][] { new Object[] { "key", ImportContainerDeletedEventData.builder().key("key") },
+                new Object[] { "version", ImportContainerDeletedEventData.builder().version(2) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerDeletedEventTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerDeletedEventTest.java
index 01624df9fc3..030a70dd6f2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerDeletedEventTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportContainerDeletedEventTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.event;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportContainerDeletedEventTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportContainerDeletedEventBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportContainerDeletedEventBuilder builder) {
         ImportContainerDeletedEvent importContainerDeletedEvent = builder.buildUnchecked();
         Assertions.assertThat(importContainerDeletedEvent).isInstanceOf(ImportContainerDeletedEvent.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ImportContainerDeletedEvent.builder()
-                        .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
-                                .findEnum("import-api")) },
-                new Object[] { ImportContainerDeletedEvent.builder()
+                new Object[] { "resourceType",
+                        ImportContainerDeletedEvent.builder()
+                                .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
+                                        .findEnum("import-api")) },
+                new Object[] { "data", ImportContainerDeletedEvent.builder()
                         .data(new com.commercetools.api.models.event.ImportContainerDeletedEventDataImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportOperationRejectedEventDataTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportOperationRejectedEventDataTest.java
index cf0931851f6..99315bec38f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportOperationRejectedEventDataTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportOperationRejectedEventDataTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.event;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportOperationRejectedEventDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportOperationRejectedEventDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportOperationRejectedEventDataBuilder builder) {
         ImportOperationRejectedEventData importOperationRejectedEventData = builder.buildUnchecked();
         Assertions.assertThat(importOperationRejectedEventData).isInstanceOf(ImportOperationRejectedEventData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportOperationRejectedEventData.builder().id("id") } };
+        return new Object[][] { new Object[] { "id", ImportOperationRejectedEventData.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportOperationRejectedEventTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportOperationRejectedEventTest.java
index e74c6fed5c5..a1b45efe7a3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportOperationRejectedEventTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportOperationRejectedEventTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.event;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportOperationRejectedEventTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportOperationRejectedEventBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportOperationRejectedEventBuilder builder) {
         ImportOperationRejectedEvent importOperationRejectedEvent = builder.buildUnchecked();
         Assertions.assertThat(importOperationRejectedEvent).isInstanceOf(ImportOperationRejectedEvent.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ImportOperationRejectedEvent.builder()
-                        .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
-                                .findEnum("import-api")) },
-                new Object[] { ImportOperationRejectedEvent.builder()
+                new Object[] { "resourceType",
+                        ImportOperationRejectedEvent.builder()
+                                .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
+                                        .findEnum("import-api")) },
+                new Object[] { "data", ImportOperationRejectedEvent.builder()
                         .data(new com.commercetools.api.models.event.ImportOperationRejectedEventDataImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportUnresolvedEventDataTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportUnresolvedEventDataTest.java
index 2ab8e5efc69..28393fae00a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportUnresolvedEventDataTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportUnresolvedEventDataTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.event;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportUnresolvedEventDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportUnresolvedEventDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportUnresolvedEventDataBuilder builder) {
         ImportUnresolvedEventData importUnresolvedEventData = builder.buildUnchecked();
         Assertions.assertThat(importUnresolvedEventData).isInstanceOf(ImportUnresolvedEventData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportUnresolvedEventData.builder().id("id") },
-                new Object[] { ImportUnresolvedEventData.builder().version(2) },
-                new Object[] { ImportUnresolvedEventData.builder().importContainerKey("importContainerKey") } };
+        return new Object[][] { new Object[] { "id", ImportUnresolvedEventData.builder().id("id") },
+                new Object[] { "version", ImportUnresolvedEventData.builder().version(2) },
+                new Object[] { "importContainerKey",
+                        ImportUnresolvedEventData.builder().importContainerKey("importContainerKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportUnresolvedEventTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportUnresolvedEventTest.java
index 0c6a1699135..75e8ba7e892 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportUnresolvedEventTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportUnresolvedEventTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.event;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportUnresolvedEventTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportUnresolvedEventBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportUnresolvedEventBuilder builder) {
         ImportUnresolvedEvent importUnresolvedEvent = builder.buildUnchecked();
         Assertions.assertThat(importUnresolvedEvent).isInstanceOf(ImportUnresolvedEvent.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ImportUnresolvedEvent.builder()
-                        .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
-                                .findEnum("import-api")) },
-                new Object[] { ImportUnresolvedEvent.builder()
+                new Object[] { "resourceType",
+                        ImportUnresolvedEvent.builder()
+                                .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
+                                        .findEnum("import-api")) },
+                new Object[] { "data", ImportUnresolvedEvent.builder()
                         .data(new com.commercetools.api.models.event.ImportUnresolvedEventDataImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportValidationFailedEventDataTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportValidationFailedEventDataTest.java
index 7f628195f70..90f3fc6d50b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportValidationFailedEventDataTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportValidationFailedEventDataTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.event;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportValidationFailedEventDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportValidationFailedEventDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportValidationFailedEventDataBuilder builder) {
         ImportValidationFailedEventData importValidationFailedEventData = builder.buildUnchecked();
         Assertions.assertThat(importValidationFailedEventData).isInstanceOf(ImportValidationFailedEventData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportValidationFailedEventData.builder().id("id") },
-                new Object[] { ImportValidationFailedEventData.builder().version(2) },
-                new Object[] { ImportValidationFailedEventData.builder().importContainerKey("importContainerKey") } };
+        return new Object[][] { new Object[] { "id", ImportValidationFailedEventData.builder().id("id") },
+                new Object[] { "version", ImportValidationFailedEventData.builder().version(2) },
+                new Object[] { "importContainerKey",
+                        ImportValidationFailedEventData.builder().importContainerKey("importContainerKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportValidationFailedEventTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportValidationFailedEventTest.java
index 973929a7650..447468d6bad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportValidationFailedEventTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportValidationFailedEventTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.event;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportValidationFailedEventTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportValidationFailedEventBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportValidationFailedEventBuilder builder) {
         ImportValidationFailedEvent importValidationFailedEvent = builder.buildUnchecked();
         Assertions.assertThat(importValidationFailedEvent).isInstanceOf(ImportValidationFailedEvent.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ImportValidationFailedEvent.builder()
-                        .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
-                                .findEnum("import-api")) },
-                new Object[] { ImportValidationFailedEvent.builder()
+                new Object[] { "resourceType",
+                        ImportValidationFailedEvent.builder()
+                                .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
+                                        .findEnum("import-api")) },
+                new Object[] { "data", ImportValidationFailedEvent.builder()
                         .data(new com.commercetools.api.models.event.ImportValidationFailedEventDataImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportWaitForMasterVariantEventDataTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportWaitForMasterVariantEventDataTest.java
index 3c6dde331c1..6191b4827e9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportWaitForMasterVariantEventDataTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportWaitForMasterVariantEventDataTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.event;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportWaitForMasterVariantEventDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportWaitForMasterVariantEventDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportWaitForMasterVariantEventDataBuilder builder) {
         ImportWaitForMasterVariantEventData importWaitForMasterVariantEventData = builder.buildUnchecked();
         Assertions.assertThat(importWaitForMasterVariantEventData)
                 .isInstanceOf(ImportWaitForMasterVariantEventData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportWaitForMasterVariantEventData.builder().id("id") },
-                new Object[] { ImportWaitForMasterVariantEventData.builder().version(2) }, new Object[] {
+        return new Object[][] { new Object[] { "id", ImportWaitForMasterVariantEventData.builder().id("id") },
+                new Object[] { "version", ImportWaitForMasterVariantEventData.builder().version(2) },
+                new Object[] { "importContainerKey",
                         ImportWaitForMasterVariantEventData.builder().importContainerKey("importContainerKey") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportWaitForMasterVariantEventTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportWaitForMasterVariantEventTest.java
index e9620446cb6..f6622fe7d34 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportWaitForMasterVariantEventTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/event/ImportWaitForMasterVariantEventTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.event;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportWaitForMasterVariantEventTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportWaitForMasterVariantEventBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportWaitForMasterVariantEventBuilder builder) {
         ImportWaitForMasterVariantEvent importWaitForMasterVariantEvent = builder.buildUnchecked();
         Assertions.assertThat(importWaitForMasterVariantEvent).isInstanceOf(ImportWaitForMasterVariantEvent.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ImportWaitForMasterVariantEvent.builder()
-                        .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
-                                .findEnum("import-api")) },
-                new Object[] { ImportWaitForMasterVariantEvent.builder()
+                new Object[] { "resourceType",
+                        ImportWaitForMasterVariantEvent.builder()
+                                .resourceType(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
+                                        .findEnum("import-api")) },
+                new Object[] { "data", ImportWaitForMasterVariantEvent.builder()
                         .data(new com.commercetools.api.models.event.ImportWaitForMasterVariantEventDataImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/AWSLambdaDestinationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/AWSLambdaDestinationTest.java
index 98a80e23852..423fa06c7f0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/AWSLambdaDestinationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/AWSLambdaDestinationTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.extension;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AWSLambdaDestinationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AWSLambdaDestinationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AWSLambdaDestinationBuilder builder) {
         AWSLambdaDestination aWSLambdaDestination = builder.buildUnchecked();
         Assertions.assertThat(aWSLambdaDestination).isInstanceOf(AWSLambdaDestination.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AWSLambdaDestination.builder().arn("arn") },
-                new Object[] { AWSLambdaDestination.builder().accessKey("accessKey") },
-                new Object[] { AWSLambdaDestination.builder().accessSecret("accessSecret") } };
+        return new Object[][] { new Object[] { "arn", AWSLambdaDestination.builder().arn("arn") },
+                new Object[] { "accessKey", AWSLambdaDestination.builder().accessKey("accessKey") },
+                new Object[] { "accessSecret", AWSLambdaDestination.builder().accessSecret("accessSecret") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/AuthorizationHeaderAuthenticationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/AuthorizationHeaderAuthenticationTest.java
index 79cf89da4fa..2e6d14c5368 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/AuthorizationHeaderAuthenticationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/AuthorizationHeaderAuthenticationTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.extension;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AuthorizationHeaderAuthenticationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AuthorizationHeaderAuthenticationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AuthorizationHeaderAuthenticationBuilder builder) {
         AuthorizationHeaderAuthentication authorizationHeaderAuthentication = builder.buildUnchecked();
         Assertions.assertThat(authorizationHeaderAuthentication).isInstanceOf(AuthorizationHeaderAuthentication.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { AuthorizationHeaderAuthentication.builder().headerValue("headerValue") } };
+        return new Object[][] { new Object[] { "headerValue",
+                AuthorizationHeaderAuthentication.builder().headerValue("headerValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/AzureFunctionsAuthenticationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/AzureFunctionsAuthenticationTest.java
index 54fcde8ef9c..85ad2482049 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/AzureFunctionsAuthenticationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/AzureFunctionsAuthenticationTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.extension;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AzureFunctionsAuthenticationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AzureFunctionsAuthenticationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AzureFunctionsAuthenticationBuilder builder) {
         AzureFunctionsAuthentication azureFunctionsAuthentication = builder.buildUnchecked();
         Assertions.assertThat(azureFunctionsAuthentication).isInstanceOf(AzureFunctionsAuthentication.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AzureFunctionsAuthentication.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", AzureFunctionsAuthentication.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionChangeDestinationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionChangeDestinationActionTest.java
index 2c4f2be19be..775c90c7c89 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionChangeDestinationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionChangeDestinationActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.extension;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionChangeDestinationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionChangeDestinationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionChangeDestinationActionBuilder builder) {
         ExtensionChangeDestinationAction extensionChangeDestinationAction = builder.buildUnchecked();
         Assertions.assertThat(extensionChangeDestinationAction).isInstanceOf(ExtensionChangeDestinationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionChangeDestinationAction.builder()
+        return new Object[][] { new Object[] { "destination", ExtensionChangeDestinationAction.builder()
                 .destination(new com.commercetools.api.models.extension.ExtensionDestinationImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionChangeTriggersActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionChangeTriggersActionTest.java
index 2fd8a96f441..3b5ee736673 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionChangeTriggersActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionChangeTriggersActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionChangeTriggersActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionChangeTriggersActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionChangeTriggersActionBuilder builder) {
         ExtensionChangeTriggersAction extensionChangeTriggersAction = builder.buildUnchecked();
         Assertions.assertThat(extensionChangeTriggersAction).isInstanceOf(ExtensionChangeTriggersAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionChangeTriggersAction.builder()
+        return new Object[][] { new Object[] { "triggers", ExtensionChangeTriggersAction.builder()
                 .triggers(
                     Collections.singletonList(new com.commercetools.api.models.extension.ExtensionTriggerImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionDraftTest.java
index 83e052b8e1d..46a99b6e94b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionDraftTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionDraftBuilder builder) {
         ExtensionDraft extensionDraft = builder.buildUnchecked();
         Assertions.assertThat(extensionDraft).isInstanceOf(ExtensionDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionDraft.builder().key("key") },
-                new Object[] { ExtensionDraft.builder()
-                        .destination(new com.commercetools.api.models.extension.ExtensionDestinationImpl()) },
-                new Object[] { ExtensionDraft.builder()
-                        .triggers(Collections
-                                .singletonList(new com.commercetools.api.models.extension.ExtensionTriggerImpl())) },
-                new Object[] { ExtensionDraft.builder().timeoutInMs(6) } };
+        return new Object[][] { new Object[] { "key", ExtensionDraft.builder().key("key") },
+                new Object[] { "destination",
+                        ExtensionDraft.builder()
+                                .destination(new com.commercetools.api.models.extension.ExtensionDestinationImpl()) },
+                new Object[] { "triggers",
+                        ExtensionDraft.builder()
+                                .triggers(Collections.singletonList(
+                                    new com.commercetools.api.models.extension.ExtensionTriggerImpl())) },
+                new Object[] { "timeoutInMs", ExtensionDraft.builder().timeoutInMs(6) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionInputTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionInputTest.java
index 0a450fd15e3..7245e7fddb8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionInputTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionInputTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.extension;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionInputTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionInputBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionInputBuilder builder) {
         ExtensionInput extensionInput = builder.buildUnchecked();
         Assertions.assertThat(extensionInput).isInstanceOf(ExtensionInput.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ExtensionInput.builder()
-                        .action(com.commercetools.api.models.extension.ExtensionAction.findEnum("Create")) },
-                new Object[] {
+                new Object[] { "action",
+                        ExtensionInput.builder()
+                                .action(com.commercetools.api.models.extension.ExtensionAction.findEnum("Create")) },
+                new Object[] { "resource",
                         ExtensionInput.builder().resource(new com.commercetools.api.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionPagedQueryResponseTest.java
index 6ac808d0392..df0741bfc04 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionPagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionPagedQueryResponseBuilder builder) {
         ExtensionPagedQueryResponse extensionPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(extensionPagedQueryResponse).isInstanceOf(ExtensionPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ExtensionPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ExtensionPagedQueryResponse.builder().count(2L) },
-                new Object[] { ExtensionPagedQueryResponse.builder().total(1L) },
-                new Object[] { ExtensionPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", ExtensionPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ExtensionPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ExtensionPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ExtensionPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", ExtensionPagedQueryResponse.builder()
                         .results(
                             Collections.singletonList(new com.commercetools.api.models.extension.ExtensionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionSetKeyActionTest.java
index a7dddea74d8..1bc5054bae9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.extension;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionSetKeyActionBuilder builder) {
         ExtensionSetKeyAction extensionSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(extensionSetKeyAction).isInstanceOf(ExtensionSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ExtensionSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionSetTimeoutInMsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionSetTimeoutInMsActionTest.java
index 21dd64ada6b..6ce989d9b08 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionSetTimeoutInMsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionSetTimeoutInMsActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.extension;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionSetTimeoutInMsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionSetTimeoutInMsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionSetTimeoutInMsActionBuilder builder) {
         ExtensionSetTimeoutInMsAction extensionSetTimeoutInMsAction = builder.buildUnchecked();
         Assertions.assertThat(extensionSetTimeoutInMsAction).isInstanceOf(ExtensionSetTimeoutInMsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionSetTimeoutInMsAction.builder().timeoutInMs(6) } };
+        return new Object[][] {
+                new Object[] { "timeoutInMs", ExtensionSetTimeoutInMsAction.builder().timeoutInMs(6) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionTest.java
index b2eb77c4f1c..1e0e4848237 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionTest.java
@@ -4,43 +4,40 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionBuilder builder) {
         Extension extension = builder.buildUnchecked();
         Assertions.assertThat(extension).isInstanceOf(Extension.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Extension.builder().id("id") },
-                new Object[] { Extension.builder().version(2L) },
-                new Object[] { Extension.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Extension.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Extension.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Extension.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { Extension.builder().key("key") },
-                new Object[] { Extension.builder()
-                        .destination(new com.commercetools.api.models.extension.ExtensionDestinationImpl()) },
-                new Object[] { Extension.builder()
-                        .triggers(Collections
-                                .singletonList(new com.commercetools.api.models.extension.ExtensionTriggerImpl())) },
-                new Object[] { Extension.builder().timeoutInMs(6) } };
+        return new Object[][] { new Object[] { "id", Extension.builder().id("id") },
+                new Object[] { "version", Extension.builder().version(2L) },
+                new Object[] { "createdAt", Extension.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Extension.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        Extension.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
+                        Extension.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
+                new Object[] { "key", Extension.builder().key("key") },
+                new Object[] { "destination",
+                        Extension.builder()
+                                .destination(new com.commercetools.api.models.extension.ExtensionDestinationImpl()) },
+                new Object[] { "triggers",
+                        Extension.builder()
+                                .triggers(Collections.singletonList(
+                                    new com.commercetools.api.models.extension.ExtensionTriggerImpl())) },
+                new Object[] { "timeoutInMs", Extension.builder().timeoutInMs(6) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionTriggerTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionTriggerTest.java
index 634d80a7f86..fddc8f427b1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionTriggerTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionTriggerTest.java
@@ -3,35 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionTriggerTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionTriggerBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionTriggerBuilder builder) {
         ExtensionTrigger extensionTrigger = builder.buildUnchecked();
         Assertions.assertThat(extensionTrigger).isInstanceOf(ExtensionTrigger.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionTrigger.builder()
-                .resourceTypeId(com.commercetools.api.models.extension.ExtensionResourceTypeId.findEnum("cart")) },
-                new Object[] { ExtensionTrigger.builder()
-                        .actions(Collections.singletonList(
-                            com.commercetools.api.models.extension.ExtensionAction.findEnum("Create"))) },
-                new Object[] { ExtensionTrigger.builder().condition("condition") } };
+        return new Object[][] {
+                new Object[] { "resourceTypeId",
+                        ExtensionTrigger.builder()
+                                .resourceTypeId(
+                                    com.commercetools.api.models.extension.ExtensionResourceTypeId.findEnum("cart")) },
+                new Object[] { "actions",
+                        ExtensionTrigger.builder()
+                                .actions(Collections.singletonList(
+                                    com.commercetools.api.models.extension.ExtensionAction.findEnum("Create"))) },
+                new Object[] { "condition", ExtensionTrigger.builder().condition("condition") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionUpdateTest.java
index 1b033711c8e..8392e369e97 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/ExtensionUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExtensionUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExtensionUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExtensionUpdateBuilder builder) {
         ExtensionUpdate extensionUpdate = builder.buildUnchecked();
         Assertions.assertThat(extensionUpdate).isInstanceOf(ExtensionUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExtensionUpdate.builder().version(2L) },
-                new Object[] { ExtensionUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.extension.ExtensionUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", ExtensionUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        ExtensionUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.extension.ExtensionUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/GoogleCloudFunctionDestinationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/GoogleCloudFunctionDestinationTest.java
index 6ef45350b2f..5269f49cae9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/GoogleCloudFunctionDestinationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/GoogleCloudFunctionDestinationTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.extension;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GoogleCloudFunctionDestinationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GoogleCloudFunctionDestinationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GoogleCloudFunctionDestinationBuilder builder) {
         GoogleCloudFunctionDestination googleCloudFunctionDestination = builder.buildUnchecked();
         Assertions.assertThat(googleCloudFunctionDestination).isInstanceOf(GoogleCloudFunctionDestination.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GoogleCloudFunctionDestination.builder().url("url") } };
+        return new Object[][] { new Object[] { "url", GoogleCloudFunctionDestination.builder().url("url") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/HttpDestinationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/HttpDestinationTest.java
index 455266f5de6..084b5620b5d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/HttpDestinationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/extension/HttpDestinationTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.extension;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class HttpDestinationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(HttpDestinationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, HttpDestinationBuilder builder) {
         HttpDestination httpDestination = builder.buildUnchecked();
         Assertions.assertThat(httpDestination).isInstanceOf(HttpDestination.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { HttpDestination.builder().url("url") },
-                new Object[] { HttpDestination.builder()
-                        .authentication(
-                            new com.commercetools.api.models.extension.HttpDestinationAuthenticationImpl()) } };
+        return new Object[][] { new Object[] { "url", HttpDestination.builder().url("url") },
+                new Object[] { "authentication",
+                        HttpDestination.builder()
+                                .authentication(
+                                    new com.commercetools.api.models.extension.HttpDestinationAuthenticationImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLErrorLocationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLErrorLocationTest.java
index 5eadb593a88..f85f6c01712 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLErrorLocationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLErrorLocationTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.graph_ql;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLErrorLocationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLErrorLocationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLErrorLocationBuilder builder) {
         GraphQLErrorLocation graphQLErrorLocation = builder.buildUnchecked();
         Assertions.assertThat(graphQLErrorLocation).isInstanceOf(GraphQLErrorLocation.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLErrorLocation.builder().line(6L) },
-                new Object[] { GraphQLErrorLocation.builder().column(2L) } };
+        return new Object[][] { new Object[] { "line", GraphQLErrorLocation.builder().line(6L) },
+                new Object[] { "column", GraphQLErrorLocation.builder().column(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLErrorTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLErrorTest.java
index 072d781b5c0..c1e6280a086 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLErrorTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLErrorTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLErrorBuilder builder) {
         GraphQLError graphQLError = builder.buildUnchecked();
         Assertions.assertThat(graphQLError).isInstanceOf(GraphQLError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLError.builder().message("message") },
-                new Object[] { GraphQLError.builder()
-                        .locations(Collections
-                                .singletonList(new com.commercetools.api.models.graph_ql.GraphQLErrorLocationImpl())) },
-                new Object[] { GraphQLError.builder().path(Collections.singletonList("path")) },
-                new Object[] { GraphQLError.builder()
+        return new Object[][] { new Object[] { "message", GraphQLError.builder().message("message") },
+                new Object[] { "locations",
+                        GraphQLError.builder()
+                                .locations(Collections.singletonList(
+                                    new com.commercetools.api.models.graph_ql.GraphQLErrorLocationImpl())) },
+                new Object[] { "path", GraphQLError.builder().path(Collections.singletonList("path")) },
+                new Object[] { "extensions", GraphQLError.builder()
                         .extensions(new com.commercetools.api.models.error.GraphQLErrorObjectImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLRequestTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLRequestTest.java
index c01b7e1ecc2..db4d984b1f7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLRequestTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLRequestTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.graph_ql;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLRequestBuilder builder) {
         GraphQLRequest graphQLRequest = builder.buildUnchecked();
         Assertions.assertThat(graphQLRequest).isInstanceOf(GraphQLRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLRequest.builder().query("query") },
-                new Object[] { GraphQLRequest.builder().operationName("operationName") },
-                new Object[] { GraphQLRequest.builder()
+        return new Object[][] { new Object[] { "query", GraphQLRequest.builder().query("query") },
+                new Object[] { "operationName", GraphQLRequest.builder().operationName("operationName") },
+                new Object[] { "variables", GraphQLRequest.builder()
                         .variables(new com.commercetools.api.models.graph_ql.GraphQLVariablesMapImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLResponseTest.java
index 7f8e4471d2c..e99062184da 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLResponseTest.java
@@ -3,32 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLResponseBuilder builder) {
         GraphQLResponse graphQLResponse = builder.buildUnchecked();
         Assertions.assertThat(graphQLResponse).isInstanceOf(GraphQLResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLResponse.builder().data("data") }, new Object[] { GraphQLResponse
-                .builder()
-                .errors(Collections.singletonList(new com.commercetools.api.models.graph_ql.GraphQLErrorImpl())) } };
+        return new Object[][] { new Object[] { "data", GraphQLResponse.builder().data("data") },
+                new Object[] { "errors",
+                        GraphQLResponse.builder()
+                                .errors(Collections.singletonList(
+                                    new com.commercetools.api.models.graph_ql.GraphQLErrorImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLVariablesMapTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLVariablesMapTest.java
index 02c470c040b..da6fa115688 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLVariablesMapTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/graph_ql/GraphQLVariablesMapTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.graph_ql;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLVariablesMapTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryAddQuantityActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryAddQuantityActionTest.java
index 359933a33ec..1d1e9f46d14 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryAddQuantityActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryAddQuantityActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.inventory;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryAddQuantityActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryAddQuantityActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryAddQuantityActionBuilder builder) {
         InventoryEntryAddQuantityAction inventoryEntryAddQuantityAction = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryAddQuantityAction).isInstanceOf(InventoryEntryAddQuantityAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntryAddQuantityAction.builder().quantity(8L) } };
+        return new Object[][] { new Object[] { "quantity", InventoryEntryAddQuantityAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryChangeQuantityActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryChangeQuantityActionTest.java
index 4746920df3e..b421fa35c43 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryChangeQuantityActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryChangeQuantityActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.inventory;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryChangeQuantityActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryChangeQuantityActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryChangeQuantityActionBuilder builder) {
         InventoryEntryChangeQuantityAction inventoryEntryChangeQuantityAction = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryChangeQuantityAction)
                 .isInstanceOf(InventoryEntryChangeQuantityAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntryChangeQuantityAction.builder().quantity(8L) } };
+        return new Object[][] {
+                new Object[] { "quantity", InventoryEntryChangeQuantityAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryDraftTest.java
index 127d1d4a212..aadcd67dc17 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryDraftTest.java
@@ -3,38 +3,30 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryDraftBuilder builder) {
         InventoryEntryDraft inventoryEntryDraft = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryDraft).isInstanceOf(InventoryEntryDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntryDraft.builder().sku("sku") },
-                new Object[] { InventoryEntryDraft.builder().key("key") },
-                new Object[] { InventoryEntryDraft.builder()
+        return new Object[][] { new Object[] { "sku", InventoryEntryDraft.builder().sku("sku") },
+                new Object[] { "key", InventoryEntryDraft.builder().key("key") },
+                new Object[] { "supplyChannel", InventoryEntryDraft.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { InventoryEntryDraft.builder().quantityOnStock(2L) },
-                new Object[] { InventoryEntryDraft.builder().restockableInDays(4L) },
-                new Object[] {
+                new Object[] { "quantityOnStock", InventoryEntryDraft.builder().quantityOnStock(2L) },
+                new Object[] { "restockableInDays", InventoryEntryDraft.builder().restockableInDays(4L) },
+                new Object[] { "expectedDelivery",
                         InventoryEntryDraft.builder().expectedDelivery(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { InventoryEntryDraft.builder()
+                new Object[] { "custom", InventoryEntryDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryReferenceTest.java
index 0970286e4f3..f54c19e2fb7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.inventory;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryReferenceBuilder builder) {
         InventoryEntryReference inventoryEntryReference = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryReference).isInstanceOf(InventoryEntryReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { InventoryEntryReference.builder()
-                        .obj(new com.commercetools.api.models.inventory.InventoryEntryImpl()) },
-                new Object[] { InventoryEntryReference.builder().id("id") } };
+                new Object[] { "obj",
+                        InventoryEntryReference.builder()
+                                .obj(new com.commercetools.api.models.inventory.InventoryEntryImpl()) },
+                new Object[] { "id", InventoryEntryReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryRemoveQuantityActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryRemoveQuantityActionTest.java
index b3ca6f18963..352453586dc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryRemoveQuantityActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryRemoveQuantityActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.inventory;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryRemoveQuantityActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryRemoveQuantityActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryRemoveQuantityActionBuilder builder) {
         InventoryEntryRemoveQuantityAction inventoryEntryRemoveQuantityAction = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryRemoveQuantityAction)
                 .isInstanceOf(InventoryEntryRemoveQuantityAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntryRemoveQuantityAction.builder().quantity(8L) } };
+        return new Object[][] {
+                new Object[] { "quantity", InventoryEntryRemoveQuantityAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryResourceIdentifierTest.java
index cd3b22fbbb1..18f90fa8715 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.inventory;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryResourceIdentifierBuilder builder) {
         InventoryEntryResourceIdentifier inventoryEntryResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryResourceIdentifier).isInstanceOf(InventoryEntryResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntryResourceIdentifier.builder().id("id") },
-                new Object[] { InventoryEntryResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", InventoryEntryResourceIdentifier.builder().id("id") },
+                new Object[] { "key", InventoryEntryResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetCustomFieldActionTest.java
index 04b60178158..96316c05dcc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetCustomFieldActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.inventory;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntrySetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntrySetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntrySetCustomFieldActionBuilder builder) {
         InventoryEntrySetCustomFieldAction inventoryEntrySetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntrySetCustomFieldAction)
                 .isInstanceOf(InventoryEntrySetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntrySetCustomFieldAction.builder().name("name") },
-                new Object[] { InventoryEntrySetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", InventoryEntrySetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", InventoryEntrySetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetCustomTypeActionTest.java
index 76463c839a9..005316a7d48 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.inventory;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntrySetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntrySetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntrySetCustomTypeActionBuilder builder) {
         InventoryEntrySetCustomTypeAction inventoryEntrySetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntrySetCustomTypeAction).isInstanceOf(InventoryEntrySetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { InventoryEntrySetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { InventoryEntrySetCustomTypeAction.builder()
+                new Object[] { "type",
+                        InventoryEntrySetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", InventoryEntrySetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetExpectedDeliveryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetExpectedDeliveryActionTest.java
index fb16319abe4..efed0c19c33 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetExpectedDeliveryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetExpectedDeliveryActionTest.java
@@ -3,31 +3,23 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntrySetExpectedDeliveryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntrySetExpectedDeliveryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntrySetExpectedDeliveryActionBuilder builder) {
         InventoryEntrySetExpectedDeliveryAction inventoryEntrySetExpectedDeliveryAction = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntrySetExpectedDeliveryAction)
                 .isInstanceOf(InventoryEntrySetExpectedDeliveryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntrySetExpectedDeliveryAction.builder()
+        return new Object[][] { new Object[] { "expectedDelivery", InventoryEntrySetExpectedDeliveryAction.builder()
                 .expectedDelivery(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetKeyActionTest.java
index a4f44c70b00..0b9bd42baa9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.inventory;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntrySetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntrySetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntrySetKeyActionBuilder builder) {
         InventoryEntrySetKeyAction inventoryEntrySetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntrySetKeyAction).isInstanceOf(InventoryEntrySetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntrySetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", InventoryEntrySetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetRestockableInDaysActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetRestockableInDaysActionTest.java
index f92404096f6..181f7c6ed16 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetRestockableInDaysActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetRestockableInDaysActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.inventory;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntrySetRestockableInDaysActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntrySetRestockableInDaysActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntrySetRestockableInDaysActionBuilder builder) {
         InventoryEntrySetRestockableInDaysAction inventoryEntrySetRestockableInDaysAction = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntrySetRestockableInDaysAction)
                 .isInstanceOf(InventoryEntrySetRestockableInDaysAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { InventoryEntrySetRestockableInDaysAction.builder().restockableInDays(4L) } };
+        return new Object[][] { new Object[] { "restockableInDays",
+                InventoryEntrySetRestockableInDaysAction.builder().restockableInDays(4L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetSupplyChannelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetSupplyChannelActionTest.java
index e9f0ed1e575..0e00ed86a6a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetSupplyChannelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntrySetSupplyChannelActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.inventory;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntrySetSupplyChannelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntrySetSupplyChannelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntrySetSupplyChannelActionBuilder builder) {
         InventoryEntrySetSupplyChannelAction inventoryEntrySetSupplyChannelAction = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntrySetSupplyChannelAction)
                 .isInstanceOf(InventoryEntrySetSupplyChannelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntrySetSupplyChannelAction.builder()
+        return new Object[][] { new Object[] { "supplyChannel", InventoryEntrySetSupplyChannelAction.builder()
                 .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryTest.java
index 8c33783a4ff..2b4be65c47d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryTest.java
@@ -3,46 +3,43 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryBuilder builder) {
         InventoryEntry inventoryEntry = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntry).isInstanceOf(InventoryEntry.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntry.builder().id("id") },
-                new Object[] { InventoryEntry.builder().version(2L) },
-                new Object[] { InventoryEntry.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { InventoryEntry.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { InventoryEntry.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", InventoryEntry.builder().id("id") },
+                new Object[] { "version", InventoryEntry.builder().version(2L) },
+                new Object[] { "createdAt",
+                        InventoryEntry.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        InventoryEntry.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        InventoryEntry.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         InventoryEntry.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { InventoryEntry.builder().key("key") },
-                new Object[] { InventoryEntry.builder().sku("sku") },
-                new Object[] { InventoryEntry.builder()
-                        .supplyChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
-                new Object[] { InventoryEntry.builder().quantityOnStock(2L) },
-                new Object[] { InventoryEntry.builder().availableQuantity(3L) },
-                new Object[] { InventoryEntry.builder().restockableInDays(4L) },
-                new Object[] { InventoryEntry.builder().expectedDelivery(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+                new Object[] { "key", InventoryEntry.builder().key("key") },
+                new Object[] { "sku", InventoryEntry.builder().sku("sku") },
+                new Object[] { "supplyChannel",
+                        InventoryEntry.builder()
+                                .supplyChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
+                new Object[] { "quantityOnStock", InventoryEntry.builder().quantityOnStock(2L) },
+                new Object[] { "availableQuantity", InventoryEntry.builder().availableQuantity(3L) },
+                new Object[] { "restockableInDays", InventoryEntry.builder().restockableInDays(4L) },
+                new Object[] { "expectedDelivery",
+                        InventoryEntry.builder().expectedDelivery(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "custom",
                         InventoryEntry.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryUpdateTest.java
index c2ede3a1cb6..8eff39c1b81 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryEntryUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryUpdateBuilder builder) {
         InventoryEntryUpdate inventoryEntryUpdate = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryUpdate).isInstanceOf(InventoryEntryUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntryUpdate.builder().version(2L) },
-                new Object[] { InventoryEntryUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.inventory.InventoryEntryUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", InventoryEntryUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        InventoryEntryUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.inventory.InventoryEntryUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryPagedQueryResponseTest.java
index b7dd1bf824b..14476fa907c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/inventory/InventoryPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryPagedQueryResponseBuilder builder) {
         InventoryPagedQueryResponse inventoryPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(inventoryPagedQueryResponse).isInstanceOf(InventoryPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryPagedQueryResponse.builder().limit(7L) },
-                new Object[] { InventoryPagedQueryResponse.builder().offset(3L) },
-                new Object[] { InventoryPagedQueryResponse.builder().count(2L) },
-                new Object[] { InventoryPagedQueryResponse.builder().total(1L) },
-                new Object[] { InventoryPagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.inventory.InventoryEntryImpl())) } };
+        return new Object[][] { new Object[] { "limit", InventoryPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", InventoryPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", InventoryPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", InventoryPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        InventoryPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.inventory.InventoryEntryImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAddAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAddAddressActionTest.java
index 05098e48940..8c8f6631e70 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAddAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAddAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitAddAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitAddAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitAddAddressActionBuilder builder) {
         MyBusinessUnitAddAddressAction myBusinessUnitAddAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitAddAddressAction).isInstanceOf(MyBusinessUnitAddAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyBusinessUnitAddAddressAction.builder()
+        return new Object[][] { new Object[] { "address", MyBusinessUnitAddAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAddBillingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAddBillingAddressIdActionTest.java
index 26d2951e022..8598456d8d2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAddBillingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAddBillingAddressIdActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitAddBillingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitAddBillingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitAddBillingAddressIdActionBuilder builder) {
         MyBusinessUnitAddBillingAddressIdAction myBusinessUnitAddBillingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitAddBillingAddressIdAction)
                 .isInstanceOf(MyBusinessUnitAddBillingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyBusinessUnitAddBillingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { MyBusinessUnitAddBillingAddressIdAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId", MyBusinessUnitAddBillingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        MyBusinessUnitAddBillingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAddShippingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAddShippingAddressIdActionTest.java
index a99f3b9bd06..1dfeccdaad3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAddShippingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAddShippingAddressIdActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitAddShippingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitAddShippingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitAddShippingAddressIdActionBuilder builder) {
         MyBusinessUnitAddShippingAddressIdAction myBusinessUnitAddShippingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitAddShippingAddressIdAction)
                 .isInstanceOf(MyBusinessUnitAddShippingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyBusinessUnitAddShippingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { MyBusinessUnitAddShippingAddressIdAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId", MyBusinessUnitAddShippingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        MyBusinessUnitAddShippingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAssociateDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAssociateDraftTest.java
index 112c6eaf02c..8b3b6d47f47 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAssociateDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitAssociateDraftTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitAssociateDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitAssociateDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitAssociateDraftBuilder builder) {
         MyBusinessUnitAssociateDraft myBusinessUnitAssociateDraft = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitAssociateDraft).isInstanceOf(MyBusinessUnitAssociateDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyBusinessUnitAssociateDraft.builder().version(2L) },
-                new Object[] { MyBusinessUnitAssociateDraft.builder()
-                        .customer(new com.commercetools.api.models.me.MyCustomerDraftImpl()) },
-                new Object[] { MyBusinessUnitAssociateDraft.builder()
+        return new Object[][] { new Object[] { "version", MyBusinessUnitAssociateDraft.builder().version(2L) },
+                new Object[] { "customer",
+                        MyBusinessUnitAssociateDraft.builder()
+                                .customer(new com.commercetools.api.models.me.MyCustomerDraftImpl()) },
+                new Object[] { "associateRoleAssignments", MyBusinessUnitAssociateDraft.builder()
                         .associateRoleAssignments(Collections.singletonList(
                             new com.commercetools.api.models.business_unit.AssociateRoleAssignmentDraftImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeAddressActionTest.java
index 3def2511afd..f749b823940 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeAddressActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitChangeAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitChangeAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitChangeAddressActionBuilder builder) {
         MyBusinessUnitChangeAddressAction myBusinessUnitChangeAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitChangeAddressAction).isInstanceOf(MyBusinessUnitChangeAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyBusinessUnitChangeAddressAction.builder().addressId("addressId") },
-                new Object[] { MyBusinessUnitChangeAddressAction.builder().addressKey("addressKey") },
-                new Object[] { MyBusinessUnitChangeAddressAction.builder()
+        return new Object[][] {
+                new Object[] { "addressId", MyBusinessUnitChangeAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey", MyBusinessUnitChangeAddressAction.builder().addressKey("addressKey") },
+                new Object[] { "address", MyBusinessUnitChangeAddressAction.builder()
                         .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeAssociateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeAssociateActionTest.java
index ce6467808e5..b617ea8037c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeAssociateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeAssociateActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitChangeAssociateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitChangeAssociateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitChangeAssociateActionBuilder builder) {
         MyBusinessUnitChangeAssociateAction myBusinessUnitChangeAssociateAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitChangeAssociateAction)
                 .isInstanceOf(MyBusinessUnitChangeAssociateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyBusinessUnitChangeAssociateAction.builder()
+        return new Object[][] { new Object[] { "associate", MyBusinessUnitChangeAssociateAction.builder()
                 .associate(new com.commercetools.api.models.business_unit.AssociateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeNameActionTest.java
index 0b762334d2e..242489cbe7d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitChangeNameActionBuilder builder) {
         MyBusinessUnitChangeNameAction myBusinessUnitChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitChangeNameAction).isInstanceOf(MyBusinessUnitChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyBusinessUnitChangeNameAction.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", MyBusinessUnitChangeNameAction.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeParentUnitActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeParentUnitActionTest.java
index 530a2bb8e39..c1b304d09cf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeParentUnitActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitChangeParentUnitActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitChangeParentUnitActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitChangeParentUnitActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitChangeParentUnitActionBuilder builder) {
         MyBusinessUnitChangeParentUnitAction myBusinessUnitChangeParentUnitAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitChangeParentUnitAction)
                 .isInstanceOf(MyBusinessUnitChangeParentUnitAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyBusinessUnitChangeParentUnitAction.builder()
+        return new Object[][] { new Object[] { "parentUnit", MyBusinessUnitChangeParentUnitAction.builder()
                 .parentUnit(new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveAddressActionTest.java
index 9cfef1de12f..c68fa3cb57d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveAddressActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitRemoveAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitRemoveAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitRemoveAddressActionBuilder builder) {
         MyBusinessUnitRemoveAddressAction myBusinessUnitRemoveAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitRemoveAddressAction).isInstanceOf(MyBusinessUnitRemoveAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyBusinessUnitRemoveAddressAction.builder().addressId("addressId") },
-                new Object[] { MyBusinessUnitRemoveAddressAction.builder().addressKey("addressKey") } };
+        return new Object[][] {
+                new Object[] { "addressId", MyBusinessUnitRemoveAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey", MyBusinessUnitRemoveAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveAssociateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveAssociateActionTest.java
index 16a067c6cd4..8b1b302d03d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveAssociateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveAssociateActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitRemoveAssociateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitRemoveAssociateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitRemoveAssociateActionBuilder builder) {
         MyBusinessUnitRemoveAssociateAction myBusinessUnitRemoveAssociateAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitRemoveAssociateAction)
                 .isInstanceOf(MyBusinessUnitRemoveAssociateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyBusinessUnitRemoveAssociateAction.builder()
+        return new Object[][] { new Object[] { "customer", MyBusinessUnitRemoveAssociateAction.builder()
                 .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveBillingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveBillingAddressIdActionTest.java
index 928a3710878..e4e41f8c960 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveBillingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveBillingAddressIdActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitRemoveBillingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitRemoveBillingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitRemoveBillingAddressIdActionBuilder builder) {
         MyBusinessUnitRemoveBillingAddressIdAction myBusinessUnitRemoveBillingAddressIdAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myBusinessUnitRemoveBillingAddressIdAction)
                 .isInstanceOf(MyBusinessUnitRemoveBillingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyBusinessUnitRemoveBillingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { MyBusinessUnitRemoveBillingAddressIdAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId",
+                        MyBusinessUnitRemoveBillingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        MyBusinessUnitRemoveBillingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveShippingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveShippingAddressIdActionTest.java
index 781514059ae..7e54a431061 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveShippingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitRemoveShippingAddressIdActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitRemoveShippingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitRemoveShippingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitRemoveShippingAddressIdActionBuilder builder) {
         MyBusinessUnitRemoveShippingAddressIdAction myBusinessUnitRemoveShippingAddressIdAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myBusinessUnitRemoveShippingAddressIdAction)
                 .isInstanceOf(MyBusinessUnitRemoveShippingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyBusinessUnitRemoveShippingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { MyBusinessUnitRemoveShippingAddressIdAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId",
+                        MyBusinessUnitRemoveShippingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        MyBusinessUnitRemoveShippingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetAddressCustomFieldActionTest.java
index fedba1527be..4b69e1ddd79 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetAddressCustomFieldActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitSetAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitSetAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitSetAddressCustomFieldActionBuilder builder) {
         MyBusinessUnitSetAddressCustomFieldAction myBusinessUnitSetAddressCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitSetAddressCustomFieldAction)
                 .isInstanceOf(MyBusinessUnitSetAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyBusinessUnitSetAddressCustomFieldAction.builder().addressId("addressId") },
-                new Object[] { MyBusinessUnitSetAddressCustomFieldAction.builder().name("name") },
-                new Object[] { MyBusinessUnitSetAddressCustomFieldAction.builder().value("value") } };
+                new Object[] { "addressId",
+                        MyBusinessUnitSetAddressCustomFieldAction.builder().addressId("addressId") },
+                new Object[] { "name", MyBusinessUnitSetAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", MyBusinessUnitSetAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetAddressCustomTypeActionTest.java
index 65253d316c5..a0de9c36838 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetAddressCustomTypeActionTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitSetAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitSetAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitSetAddressCustomTypeActionBuilder builder) {
         MyBusinessUnitSetAddressCustomTypeAction myBusinessUnitSetAddressCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitSetAddressCustomTypeAction)
                 .isInstanceOf(MyBusinessUnitSetAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyBusinessUnitSetAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { MyBusinessUnitSetAddressCustomTypeAction.builder()
-                        .fields(new com.commercetools.api.models.type.FieldContainerImpl()) },
-                new Object[] { MyBusinessUnitSetAddressCustomTypeAction.builder().addressId("addressId") } };
+                new Object[] { "type",
+                        MyBusinessUnitSetAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields",
+                        MyBusinessUnitSetAddressCustomTypeAction.builder()
+                                .fields(new com.commercetools.api.models.type.FieldContainerImpl()) },
+                new Object[] { "addressId",
+                        MyBusinessUnitSetAddressCustomTypeAction.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetContactEmailActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetContactEmailActionTest.java
index dd154f6b546..3af0344465e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetContactEmailActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetContactEmailActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitSetContactEmailActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitSetContactEmailActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitSetContactEmailActionBuilder builder) {
         MyBusinessUnitSetContactEmailAction myBusinessUnitSetContactEmailAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitSetContactEmailAction)
                 .isInstanceOf(MyBusinessUnitSetContactEmailAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { MyBusinessUnitSetContactEmailAction.builder().contactEmail("contactEmail") } };
+        return new Object[][] { new Object[] { "contactEmail",
+                MyBusinessUnitSetContactEmailAction.builder().contactEmail("contactEmail") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetCustomFieldActionTest.java
index b68f8faad6a..b12d9563a4d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetCustomFieldActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitSetCustomFieldActionBuilder builder) {
         MyBusinessUnitSetCustomFieldAction myBusinessUnitSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitSetCustomFieldAction)
                 .isInstanceOf(MyBusinessUnitSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyBusinessUnitSetCustomFieldAction.builder().name("name") },
-                new Object[] { MyBusinessUnitSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", MyBusinessUnitSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", MyBusinessUnitSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetCustomTypeActionTest.java
index d682ef47d29..9914afa05a7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitSetCustomTypeActionBuilder builder) {
         MyBusinessUnitSetCustomTypeAction myBusinessUnitSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitSetCustomTypeAction).isInstanceOf(MyBusinessUnitSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyBusinessUnitSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { MyBusinessUnitSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        MyBusinessUnitSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", MyBusinessUnitSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetDefaultBillingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetDefaultBillingAddressActionTest.java
index 03b00bec3bd..60e97fe9afa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetDefaultBillingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetDefaultBillingAddressActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitSetDefaultBillingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitSetDefaultBillingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitSetDefaultBillingAddressActionBuilder builder) {
         MyBusinessUnitSetDefaultBillingAddressAction myBusinessUnitSetDefaultBillingAddressAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myBusinessUnitSetDefaultBillingAddressAction)
                 .isInstanceOf(MyBusinessUnitSetDefaultBillingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyBusinessUnitSetDefaultBillingAddressAction.builder().addressId("addressId") },
-                new Object[] { MyBusinessUnitSetDefaultBillingAddressAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId",
+                        MyBusinessUnitSetDefaultBillingAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        MyBusinessUnitSetDefaultBillingAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetDefaultShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetDefaultShippingAddressActionTest.java
index 2885849b9ff..c6bc3b33824 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetDefaultShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitSetDefaultShippingAddressActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitSetDefaultShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitSetDefaultShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitSetDefaultShippingAddressActionBuilder builder) {
         MyBusinessUnitSetDefaultShippingAddressAction myBusinessUnitSetDefaultShippingAddressAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myBusinessUnitSetDefaultShippingAddressAction)
                 .isInstanceOf(MyBusinessUnitSetDefaultShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyBusinessUnitSetDefaultShippingAddressAction.builder().addressId("addressId") },
-                new Object[] { MyBusinessUnitSetDefaultShippingAddressAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId",
+                        MyBusinessUnitSetDefaultShippingAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        MyBusinessUnitSetDefaultShippingAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitUpdateTest.java
index 699c43563be..ed76d868f4a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyBusinessUnitUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyBusinessUnitUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyBusinessUnitUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyBusinessUnitUpdateBuilder builder) {
         MyBusinessUnitUpdate myBusinessUnitUpdate = builder.buildUnchecked();
         Assertions.assertThat(myBusinessUnitUpdate).isInstanceOf(MyBusinessUnitUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyBusinessUnitUpdate.builder().version(2L) },
-                new Object[] { MyBusinessUnitUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.me.MyBusinessUnitUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", MyBusinessUnitUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        MyBusinessUnitUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.me.MyBusinessUnitUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddDiscountCodeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddDiscountCodeActionTest.java
index 1865c17206d..c3fa3f69e50 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddDiscountCodeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddDiscountCodeActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartAddDiscountCodeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartAddDiscountCodeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartAddDiscountCodeActionBuilder builder) {
         MyCartAddDiscountCodeAction myCartAddDiscountCodeAction = builder.buildUnchecked();
         Assertions.assertThat(myCartAddDiscountCodeAction).isInstanceOf(MyCartAddDiscountCodeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartAddDiscountCodeAction.builder().code("code") } };
+        return new Object[][] { new Object[] { "code", MyCartAddDiscountCodeAction.builder().code("code") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddItemShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddItemShippingAddressActionTest.java
index f9ec0b3cd8d..a661d0fd601 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddItemShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddItemShippingAddressActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartAddItemShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartAddItemShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartAddItemShippingAddressActionBuilder builder) {
         MyCartAddItemShippingAddressAction myCartAddItemShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myCartAddItemShippingAddressAction)
                 .isInstanceOf(MyCartAddItemShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartAddItemShippingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", MyCartAddItemShippingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddLineItemActionTest.java
index 403c716a1d1..7b0a4459ccc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddLineItemActionTest.java
@@ -3,43 +3,37 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartAddLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartAddLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartAddLineItemActionBuilder builder) {
         MyCartAddLineItemAction myCartAddLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(myCartAddLineItemAction).isInstanceOf(MyCartAddLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartAddLineItemAction.builder().key("key") },
-                new Object[] { MyCartAddLineItemAction.builder().productId("productId") },
-                new Object[] { MyCartAddLineItemAction.builder().variantId(5L) },
-                new Object[] { MyCartAddLineItemAction.builder().sku("sku") },
-                new Object[] { MyCartAddLineItemAction.builder().quantity(8L) },
-                new Object[] { MyCartAddLineItemAction.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { MyCartAddLineItemAction.builder()
-                        .distributionChannel(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { MyCartAddLineItemAction.builder()
+        return new Object[][] { new Object[] { "key", MyCartAddLineItemAction.builder().key("key") },
+                new Object[] { "productId", MyCartAddLineItemAction.builder().productId("productId") },
+                new Object[] { "variantId", MyCartAddLineItemAction.builder().variantId(5L) },
+                new Object[] { "sku", MyCartAddLineItemAction.builder().sku("sku") },
+                new Object[] { "quantity", MyCartAddLineItemAction.builder().quantity(8L) },
+                new Object[] { "addedAt",
+                        MyCartAddLineItemAction.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "distributionChannel",
+                        MyCartAddLineItemAction.builder()
+                                .distributionChannel(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "supplyChannel", MyCartAddLineItemAction.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { MyCartAddLineItemAction.builder()
+                new Object[] { "shippingDetails", MyCartAddLineItemAction.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) },
-                new Object[] { MyCartAddLineItemAction.builder()
+                new Object[] { "custom", MyCartAddLineItemAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddPaymentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddPaymentActionTest.java
index 70e5baffaae..c891ddcfd4c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddPaymentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartAddPaymentActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartAddPaymentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartAddPaymentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartAddPaymentActionBuilder builder) {
         MyCartAddPaymentAction myCartAddPaymentAction = builder.buildUnchecked();
         Assertions.assertThat(myCartAddPaymentAction).isInstanceOf(MyCartAddPaymentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartAddPaymentAction.builder()
+        return new Object[][] { new Object[] { "payment", MyCartAddPaymentAction.builder()
                 .payment(new com.commercetools.api.models.payment.PaymentResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartApplyDeltaToLineItemShippingDetailsTargetsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartApplyDeltaToLineItemShippingDetailsTargetsActionTest.java
index 4e2bece0360..20a976836e7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartApplyDeltaToLineItemShippingDetailsTargetsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartApplyDeltaToLineItemShippingDetailsTargetsActionTest.java
@@ -3,39 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartApplyDeltaToLineItemShippingDetailsTargetsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartApplyDeltaToLineItemShippingDetailsTargetsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartApplyDeltaToLineItemShippingDetailsTargetsActionBuilder builder) {
         MyCartApplyDeltaToLineItemShippingDetailsTargetsAction myCartApplyDeltaToLineItemShippingDetailsTargetsAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myCartApplyDeltaToLineItemShippingDetailsTargetsAction)
                 .isInstanceOf(MyCartApplyDeltaToLineItemShippingDetailsTargetsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "lineItemId",
                         MyCartApplyDeltaToLineItemShippingDetailsTargetsAction.builder().lineItemId("lineItemId") },
-                new Object[] {
+                new Object[] { "lineItemKey",
                         MyCartApplyDeltaToLineItemShippingDetailsTargetsAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { MyCartApplyDeltaToLineItemShippingDetailsTargetsAction.builder()
-                        .targetsDelta(Collections
-                                .singletonList(new com.commercetools.api.models.cart.ItemShippingTargetImpl())) } };
+                new Object[] { "targetsDelta",
+                        MyCartApplyDeltaToLineItemShippingDetailsTargetsAction.builder()
+                                .targetsDelta(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.ItemShippingTargetImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartChangeLineItemQuantityActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartChangeLineItemQuantityActionTest.java
index 87181fd29e9..6635f51f6d1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartChangeLineItemQuantityActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartChangeLineItemQuantityActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartChangeLineItemQuantityActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartChangeLineItemQuantityActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartChangeLineItemQuantityActionBuilder builder) {
         MyCartChangeLineItemQuantityAction myCartChangeLineItemQuantityAction = builder.buildUnchecked();
         Assertions.assertThat(myCartChangeLineItemQuantityAction)
                 .isInstanceOf(MyCartChangeLineItemQuantityAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartChangeLineItemQuantityAction.builder().lineItemId("lineItemId") },
-                new Object[] { MyCartChangeLineItemQuantityAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { MyCartChangeLineItemQuantityAction.builder().quantity(8L) } };
+        return new Object[][] {
+                new Object[] { "lineItemId", MyCartChangeLineItemQuantityAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", MyCartChangeLineItemQuantityAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "quantity", MyCartChangeLineItemQuantityAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartChangeLineItemsOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartChangeLineItemsOrderActionTest.java
index 034e4319bd6..2394bf39bed 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartChangeLineItemsOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartChangeLineItemsOrderActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartChangeLineItemsOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartChangeLineItemsOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartChangeLineItemsOrderActionBuilder builder) {
         MyCartChangeLineItemsOrderAction myCartChangeLineItemsOrderAction = builder.buildUnchecked();
         Assertions.assertThat(myCartChangeLineItemsOrderAction).isInstanceOf(MyCartChangeLineItemsOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartChangeLineItemsOrderAction.builder()
+        return new Object[][] { new Object[] { "lineItemOrder", MyCartChangeLineItemsOrderAction.builder()
                 .lineItemOrder(Collections.singletonList("lineItemOrder")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartChangeTaxModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartChangeTaxModeActionTest.java
index 7ed79686901..ac0fc90f3ca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartChangeTaxModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartChangeTaxModeActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartChangeTaxModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartChangeTaxModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartChangeTaxModeActionBuilder builder) {
         MyCartChangeTaxModeAction myCartChangeTaxModeAction = builder.buildUnchecked();
         Assertions.assertThat(myCartChangeTaxModeAction).isInstanceOf(MyCartChangeTaxModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartChangeTaxModeAction.builder()
+        return new Object[][] { new Object[] { "taxMode", MyCartChangeTaxModeAction.builder()
                 .taxMode(com.commercetools.api.models.cart.TaxMode.findEnum("Platform")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartDraftTest.java
index f8a08e0f591..1e9da670f7a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartDraftTest.java
@@ -3,61 +3,61 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartDraftBuilder builder) {
         MyCartDraft myCartDraft = builder.buildUnchecked();
         Assertions.assertThat(myCartDraft).isInstanceOf(MyCartDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartDraft.builder().currency("currency") },
-                new Object[] { MyCartDraft.builder().customerEmail("customerEmail") },
-                new Object[] { MyCartDraft.builder()
+        return new Object[][] { new Object[] { "currency", MyCartDraft.builder().currency("currency") },
+                new Object[] { "customerEmail", MyCartDraft.builder().customerEmail("customerEmail") },
+                new Object[] { "businessUnit", MyCartDraft.builder()
                         .businessUnit(
                             new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) },
-                new Object[] { MyCartDraft.builder()
-                        .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) },
-                new Object[] {
+                new Object[] { "store",
+                        MyCartDraft.builder()
+                                .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) },
+                new Object[] { "lineItems",
                         MyCartDraft.builder()
                                 .lineItems(Collections
                                         .singletonList(new com.commercetools.api.models.me.MyLineItemDraftImpl())) },
-                new Object[] {
+                new Object[] { "taxMode",
                         MyCartDraft.builder().taxMode(com.commercetools.api.models.cart.TaxMode.findEnum("Platform")) },
-                new Object[] { MyCartDraft.builder()
-                        .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
-                new Object[] { MyCartDraft.builder()
-                        .billingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { MyCartDraft.builder()
-                        .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { MyCartDraft.builder()
+                new Object[] { "inventoryMode",
+                        MyCartDraft.builder()
+                                .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
+                new Object[] { "billingAddress",
+                        MyCartDraft.builder()
+                                .billingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "shippingAddress",
+                        MyCartDraft.builder()
+                                .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "shippingMethod", MyCartDraft.builder()
                         .shippingMethod(
                             new com.commercetools.api.models.shipping_method.ShippingMethodResourceIdentifierImpl()) },
-                new Object[] {
+                new Object[] { "itemShippingAddresses",
                         MyCartDraft.builder()
                                 .itemShippingAddresses(Collections
                                         .singletonList(new com.commercetools.api.models.common.BaseAddressImpl())) },
-                new Object[] { MyCartDraft.builder()
-                        .shippingMode(com.commercetools.api.models.cart.ShippingMode.findEnum("Single")) },
-                new Object[] { MyCartDraft.builder().discountCodes(Collections.singletonList("discountCodes")) },
-                new Object[] { MyCartDraft.builder().country("country") },
-                new Object[] { MyCartDraft.builder().locale("locale") },
-                new Object[] { MyCartDraft.builder().deleteDaysAfterLastModification(3L) }, new Object[] {
+                new Object[] { "shippingMode",
+                        MyCartDraft.builder()
+                                .shippingMode(com.commercetools.api.models.cart.ShippingMode.findEnum("Single")) },
+                new Object[] { "discountCodes",
+                        MyCartDraft.builder().discountCodes(Collections.singletonList("discountCodes")) },
+                new Object[] { "country", MyCartDraft.builder().country("country") },
+                new Object[] { "locale", MyCartDraft.builder().locale("locale") },
+                new Object[] { "deleteDaysAfterLastModification",
+                        MyCartDraft.builder().deleteDaysAfterLastModification(3L) },
+                new Object[] { "custom",
                         MyCartDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRecalculateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRecalculateActionTest.java
index b2b2f1d18f7..821cd34450c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRecalculateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRecalculateActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartRecalculateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartRecalculateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartRecalculateActionBuilder builder) {
         MyCartRecalculateAction myCartRecalculateAction = builder.buildUnchecked();
         Assertions.assertThat(myCartRecalculateAction).isInstanceOf(MyCartRecalculateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartRecalculateAction.builder().updateProductData(true) } };
+        return new Object[][] {
+                new Object[] { "updateProductData", MyCartRecalculateAction.builder().updateProductData(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemoveDiscountCodeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemoveDiscountCodeActionTest.java
index ea51d714792..f8f18c920fe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemoveDiscountCodeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemoveDiscountCodeActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartRemoveDiscountCodeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartRemoveDiscountCodeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartRemoveDiscountCodeActionBuilder builder) {
         MyCartRemoveDiscountCodeAction myCartRemoveDiscountCodeAction = builder.buildUnchecked();
         Assertions.assertThat(myCartRemoveDiscountCodeAction).isInstanceOf(MyCartRemoveDiscountCodeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartRemoveDiscountCodeAction.builder()
+        return new Object[][] { new Object[] { "discountCode", MyCartRemoveDiscountCodeAction.builder()
                 .discountCode(new com.commercetools.api.models.discount_code.DiscountCodeReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemoveItemShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemoveItemShippingAddressActionTest.java
index be2b6ed0178..6eed2cc6798 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemoveItemShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemoveItemShippingAddressActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartRemoveItemShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartRemoveItemShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartRemoveItemShippingAddressActionBuilder builder) {
         MyCartRemoveItemShippingAddressAction myCartRemoveItemShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myCartRemoveItemShippingAddressAction)
                 .isInstanceOf(MyCartRemoveItemShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { MyCartRemoveItemShippingAddressAction.builder().addressKey("addressKey") } };
+        return new Object[][] { new Object[] { "addressKey",
+                MyCartRemoveItemShippingAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemoveLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemoveLineItemActionTest.java
index 6c93fc3ee07..d6fd045070e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemoveLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemoveLineItemActionTest.java
@@ -1,39 +1,34 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartRemoveLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartRemoveLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartRemoveLineItemActionBuilder builder) {
         MyCartRemoveLineItemAction myCartRemoveLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(myCartRemoveLineItemAction).isInstanceOf(MyCartRemoveLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartRemoveLineItemAction.builder().lineItemId("lineItemId") },
-                new Object[] { MyCartRemoveLineItemAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { MyCartRemoveLineItemAction.builder().quantity(8L) },
-                new Object[] { MyCartRemoveLineItemAction.builder()
-                        .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { MyCartRemoveLineItemAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", MyCartRemoveLineItemAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", MyCartRemoveLineItemAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "quantity", MyCartRemoveLineItemAction.builder().quantity(8L) },
+                new Object[] { "externalPrice",
+                        MyCartRemoveLineItemAction.builder()
+                                .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "externalTotalPrice", MyCartRemoveLineItemAction.builder()
                         .externalTotalPrice(new com.commercetools.api.models.cart.ExternalLineItemTotalPriceImpl()) },
-                new Object[] { MyCartRemoveLineItemAction.builder()
-                        .shippingDetailsToRemove(
-                            new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
+                new Object[] { "shippingDetailsToRemove",
+                        MyCartRemoveLineItemAction.builder()
+                                .shippingDetailsToRemove(
+                                    new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemovePaymentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemovePaymentActionTest.java
index 6297a09dc46..68718ae7990 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemovePaymentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartRemovePaymentActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartRemovePaymentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartRemovePaymentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartRemovePaymentActionBuilder builder) {
         MyCartRemovePaymentAction myCartRemovePaymentAction = builder.buildUnchecked();
         Assertions.assertThat(myCartRemovePaymentAction).isInstanceOf(MyCartRemovePaymentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartRemovePaymentAction.builder()
+        return new Object[][] { new Object[] { "payment", MyCartRemovePaymentAction.builder()
                 .payment(new com.commercetools.api.models.payment.PaymentResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetBillingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetBillingAddressActionTest.java
index 63f5d602c65..6fbb494b9b2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetBillingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetBillingAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetBillingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetBillingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetBillingAddressActionBuilder builder) {
         MyCartSetBillingAddressAction myCartSetBillingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetBillingAddressAction).isInstanceOf(MyCartSetBillingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartSetBillingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", MyCartSetBillingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetBusinessUnitActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetBusinessUnitActionTest.java
index ea8bc77657f..1c6af6a18dc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetBusinessUnitActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetBusinessUnitActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetBusinessUnitActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetBusinessUnitActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetBusinessUnitActionBuilder builder) {
         MyCartSetBusinessUnitAction myCartSetBusinessUnitAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetBusinessUnitAction).isInstanceOf(MyCartSetBusinessUnitAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartSetBusinessUnitAction.builder()
+        return new Object[][] { new Object[] { "businessUnit", MyCartSetBusinessUnitAction.builder()
                 .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCountryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCountryActionTest.java
index ab9906ab45c..ecf0eafa8b8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCountryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCountryActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetCountryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetCountryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetCountryActionBuilder builder) {
         MyCartSetCountryAction myCartSetCountryAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetCountryAction).isInstanceOf(MyCartSetCountryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartSetCountryAction.builder().country("country") } };
+        return new Object[][] { new Object[] { "country", MyCartSetCountryAction.builder().country("country") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCustomFieldActionTest.java
index d72293d7277..590f09672e7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetCustomFieldActionBuilder builder) {
         MyCartSetCustomFieldAction myCartSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetCustomFieldAction).isInstanceOf(MyCartSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartSetCustomFieldAction.builder().name("name") },
-                new Object[] { MyCartSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", MyCartSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", MyCartSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCustomTypeActionTest.java
index 9048db01948..3c3c48d1a0c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetCustomTypeActionBuilder builder) {
         MyCartSetCustomTypeAction myCartSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetCustomTypeAction).isInstanceOf(MyCartSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyCartSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { MyCartSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        MyCartSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", MyCartSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCustomerEmailActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCustomerEmailActionTest.java
index c0d3826d6bc..6360bbc091d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCustomerEmailActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetCustomerEmailActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetCustomerEmailActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetCustomerEmailActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetCustomerEmailActionBuilder builder) {
         MyCartSetCustomerEmailAction myCartSetCustomerEmailAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetCustomerEmailAction).isInstanceOf(MyCartSetCustomerEmailAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartSetCustomerEmailAction.builder().email("email") } };
+        return new Object[][] { new Object[] { "email", MyCartSetCustomerEmailAction.builder().email("email") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetDeleteDaysAfterLastModificationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetDeleteDaysAfterLastModificationActionTest.java
index e012c6e1782..887de054bd5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetDeleteDaysAfterLastModificationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetDeleteDaysAfterLastModificationActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetDeleteDaysAfterLastModificationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetDeleteDaysAfterLastModificationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetDeleteDaysAfterLastModificationActionBuilder builder) {
         MyCartSetDeleteDaysAfterLastModificationAction myCartSetDeleteDaysAfterLastModificationAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myCartSetDeleteDaysAfterLastModificationAction)
                 .isInstanceOf(MyCartSetDeleteDaysAfterLastModificationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "deleteDaysAfterLastModification",
                 MyCartSetDeleteDaysAfterLastModificationAction.builder().deleteDaysAfterLastModification(3) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemCustomFieldActionTest.java
index aecd6e5df43..61245b3f461 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemCustomFieldActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetLineItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetLineItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetLineItemCustomFieldActionBuilder builder) {
         MyCartSetLineItemCustomFieldAction myCartSetLineItemCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetLineItemCustomFieldAction)
                 .isInstanceOf(MyCartSetLineItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartSetLineItemCustomFieldAction.builder().lineItemId("lineItemId") },
-                new Object[] { MyCartSetLineItemCustomFieldAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { MyCartSetLineItemCustomFieldAction.builder().name("name") },
-                new Object[] { MyCartSetLineItemCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "lineItemId", MyCartSetLineItemCustomFieldAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", MyCartSetLineItemCustomFieldAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "name", MyCartSetLineItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", MyCartSetLineItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemCustomTypeActionTest.java
index b9ab2f02ea1..a31691e872c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemCustomTypeActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetLineItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetLineItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetLineItemCustomTypeActionBuilder builder) {
         MyCartSetLineItemCustomTypeAction myCartSetLineItemCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetLineItemCustomTypeAction).isInstanceOf(MyCartSetLineItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartSetLineItemCustomTypeAction.builder().lineItemId("lineItemId") },
-                new Object[] { MyCartSetLineItemCustomTypeAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { MyCartSetLineItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { MyCartSetLineItemCustomTypeAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", MyCartSetLineItemCustomTypeAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", MyCartSetLineItemCustomTypeAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "type",
+                        MyCartSetLineItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", MyCartSetLineItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemDistributionChannelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemDistributionChannelActionTest.java
index 16707838369..811ddd40a87 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemDistributionChannelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemDistributionChannelActionTest.java
@@ -1,37 +1,32 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetLineItemDistributionChannelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetLineItemDistributionChannelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetLineItemDistributionChannelActionBuilder builder) {
         MyCartSetLineItemDistributionChannelAction myCartSetLineItemDistributionChannelAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myCartSetLineItemDistributionChannelAction)
                 .isInstanceOf(MyCartSetLineItemDistributionChannelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyCartSetLineItemDistributionChannelAction.builder().lineItemId("lineItemId") },
-                new Object[] { MyCartSetLineItemDistributionChannelAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { MyCartSetLineItemDistributionChannelAction.builder()
-                        .distributionChannel(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
+                new Object[] { "lineItemId",
+                        MyCartSetLineItemDistributionChannelAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        MyCartSetLineItemDistributionChannelAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "distributionChannel",
+                        MyCartSetLineItemDistributionChannelAction.builder()
+                                .distributionChannel(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemShippingDetailsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemShippingDetailsActionTest.java
index f7d13ba793c..d1f87ebb961 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemShippingDetailsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemShippingDetailsActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetLineItemShippingDetailsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetLineItemShippingDetailsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetLineItemShippingDetailsActionBuilder builder) {
         MyCartSetLineItemShippingDetailsAction myCartSetLineItemShippingDetailsAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetLineItemShippingDetailsAction)
                 .isInstanceOf(MyCartSetLineItemShippingDetailsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyCartSetLineItemShippingDetailsAction.builder().lineItemId("lineItemId") },
-                new Object[] { MyCartSetLineItemShippingDetailsAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { MyCartSetLineItemShippingDetailsAction.builder()
+                new Object[] { "lineItemId",
+                        MyCartSetLineItemShippingDetailsAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        MyCartSetLineItemShippingDetailsAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "shippingDetails", MyCartSetLineItemShippingDetailsAction.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemSupplyChannelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemSupplyChannelActionTest.java
index ae67b597922..011da50ff00 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemSupplyChannelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLineItemSupplyChannelActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetLineItemSupplyChannelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetLineItemSupplyChannelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetLineItemSupplyChannelActionBuilder builder) {
         MyCartSetLineItemSupplyChannelAction myCartSetLineItemSupplyChannelAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetLineItemSupplyChannelAction)
                 .isInstanceOf(MyCartSetLineItemSupplyChannelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyCartSetLineItemSupplyChannelAction.builder().lineItemId("lineItemId") },
-                new Object[] { MyCartSetLineItemSupplyChannelAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { MyCartSetLineItemSupplyChannelAction.builder()
+                new Object[] { "lineItemId", MyCartSetLineItemSupplyChannelAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        MyCartSetLineItemSupplyChannelAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "supplyChannel", MyCartSetLineItemSupplyChannelAction.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLocaleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLocaleActionTest.java
index 799c4eb5d06..338330b93b1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLocaleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetLocaleActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetLocaleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetLocaleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetLocaleActionBuilder builder) {
         MyCartSetLocaleAction myCartSetLocaleAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetLocaleAction).isInstanceOf(MyCartSetLocaleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartSetLocaleAction.builder().locale("locale") } };
+        return new Object[][] { new Object[] { "locale", MyCartSetLocaleAction.builder().locale("locale") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetShippingAddressActionTest.java
index 85851b7f42d..c021d139594 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetShippingAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetShippingAddressActionBuilder builder) {
         MyCartSetShippingAddressAction myCartSetShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetShippingAddressAction).isInstanceOf(MyCartSetShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartSetShippingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", MyCartSetShippingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetShippingMethodActionTest.java
index f77b0d31af3..c9176d4019a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetShippingMethodActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartSetShippingMethodActionTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartSetShippingMethodActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartSetShippingMethodActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartSetShippingMethodActionBuilder builder) {
         MyCartSetShippingMethodAction myCartSetShippingMethodAction = builder.buildUnchecked();
         Assertions.assertThat(myCartSetShippingMethodAction).isInstanceOf(MyCartSetShippingMethodAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyCartSetShippingMethodAction.builder()
+                new Object[] { "shippingMethod", MyCartSetShippingMethodAction.builder()
                         .shippingMethod(
                             new com.commercetools.api.models.shipping_method.ShippingMethodResourceIdentifierImpl()) },
-                new Object[] { MyCartSetShippingMethodAction.builder()
+                new Object[] { "externalTaxRate", MyCartSetShippingMethodAction.builder()
                         .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartUpdateItemShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartUpdateItemShippingAddressActionTest.java
index ed3c4413caf..8501dcd5b29 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartUpdateItemShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartUpdateItemShippingAddressActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartUpdateItemShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartUpdateItemShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartUpdateItemShippingAddressActionBuilder builder) {
         MyCartUpdateItemShippingAddressAction myCartUpdateItemShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myCartUpdateItemShippingAddressAction)
                 .isInstanceOf(MyCartUpdateItemShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartUpdateItemShippingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", MyCartUpdateItemShippingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartUpdateTest.java
index a76ef4be9c2..4824da7f90a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCartUpdateTest.java
@@ -3,32 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCartUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCartUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCartUpdateBuilder builder) {
         MyCartUpdate myCartUpdate = builder.buildUnchecked();
         Assertions.assertThat(myCartUpdate).isInstanceOf(MyCartUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCartUpdate.builder().version(2L) }, new Object[] { MyCartUpdate
-                .builder()
-                .actions(Collections.singletonList(new com.commercetools.api.models.me.MyCartUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", MyCartUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        MyCartUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.me.MyCartUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCompanyDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCompanyDraftTest.java
index fc35f66a32c..54e31632c7a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCompanyDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCompanyDraftTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCompanyDraftTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerAddAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerAddAddressActionTest.java
index 36fca828319..62e02fd72f8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerAddAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerAddAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerAddAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerAddAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerAddAddressActionBuilder builder) {
         MyCustomerAddAddressAction myCustomerAddAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerAddAddressAction).isInstanceOf(MyCustomerAddAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerAddAddressAction.builder()
+        return new Object[][] { new Object[] { "address", MyCustomerAddAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerAddBillingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerAddBillingAddressIdActionTest.java
index 6c449955bef..f12f21ed9f2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerAddBillingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerAddBillingAddressIdActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerAddBillingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerAddBillingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerAddBillingAddressIdActionBuilder builder) {
         MyCustomerAddBillingAddressIdAction myCustomerAddBillingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerAddBillingAddressIdAction)
                 .isInstanceOf(MyCustomerAddBillingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerAddBillingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { MyCustomerAddBillingAddressIdAction.builder().addressKey("addressKey") } };
+        return new Object[][] {
+                new Object[] { "addressId", MyCustomerAddBillingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey", MyCustomerAddBillingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerAddShippingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerAddShippingAddressIdActionTest.java
index 87acb70ce8d..0d47f67626f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerAddShippingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerAddShippingAddressIdActionTest.java
@@ -1,32 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerAddShippingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerAddShippingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerAddShippingAddressIdActionBuilder builder) {
         MyCustomerAddShippingAddressIdAction myCustomerAddShippingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerAddShippingAddressIdAction)
                 .isInstanceOf(MyCustomerAddShippingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerAddShippingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { MyCustomerAddShippingAddressIdAction.builder().addressKey("addressKey") } };
+        return new Object[][] {
+                new Object[] { "addressId", MyCustomerAddShippingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        MyCustomerAddShippingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerChangeAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerChangeAddressActionTest.java
index 189e1fe2104..395ee3b0590 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerChangeAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerChangeAddressActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerChangeAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerChangeAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerChangeAddressActionBuilder builder) {
         MyCustomerChangeAddressAction myCustomerChangeAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerChangeAddressAction).isInstanceOf(MyCustomerChangeAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerChangeAddressAction.builder().addressId("addressId") },
-                new Object[] { MyCustomerChangeAddressAction.builder().addressKey("addressKey") },
-                new Object[] { MyCustomerChangeAddressAction.builder()
+        return new Object[][] {
+                new Object[] { "addressId", MyCustomerChangeAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey", MyCustomerChangeAddressAction.builder().addressKey("addressKey") },
+                new Object[] { "address", MyCustomerChangeAddressAction.builder()
                         .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerChangeEmailActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerChangeEmailActionTest.java
index c4e9ac50320..753bfa13f44 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerChangeEmailActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerChangeEmailActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerChangeEmailActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerChangeEmailActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerChangeEmailActionBuilder builder) {
         MyCustomerChangeEmailAction myCustomerChangeEmailAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerChangeEmailAction).isInstanceOf(MyCustomerChangeEmailAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerChangeEmailAction.builder().email("email") } };
+        return new Object[][] { new Object[] { "email", MyCustomerChangeEmailAction.builder().email("email") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerDraftTest.java
index 01dfc915fed..9f41b29b4fd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerDraftTest.java
@@ -4,51 +4,45 @@
 import java.time.LocalDate;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerDraftBuilder builder) {
         MyCustomerDraft myCustomerDraft = builder.buildUnchecked();
         Assertions.assertThat(myCustomerDraft).isInstanceOf(MyCustomerDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerDraft.builder().email("email") },
-                new Object[] { MyCustomerDraft.builder().password("password") },
-                new Object[] { MyCustomerDraft.builder().firstName("firstName") },
-                new Object[] { MyCustomerDraft.builder().lastName("lastName") },
-                new Object[] { MyCustomerDraft.builder().middleName("middleName") },
-                new Object[] { MyCustomerDraft.builder().title("title") },
-                new Object[] { MyCustomerDraft.builder().salutation("salutation") },
-                new Object[] { MyCustomerDraft.builder().dateOfBirth(LocalDate.parse("2023-06-01")) },
-                new Object[] { MyCustomerDraft.builder().companyName("companyName") },
-                new Object[] { MyCustomerDraft.builder().vatId("vatId") },
-                new Object[] {
+        return new Object[][] { new Object[] { "email", MyCustomerDraft.builder().email("email") },
+                new Object[] { "password", MyCustomerDraft.builder().password("password") },
+                new Object[] { "firstName", MyCustomerDraft.builder().firstName("firstName") },
+                new Object[] { "lastName", MyCustomerDraft.builder().lastName("lastName") },
+                new Object[] { "middleName", MyCustomerDraft.builder().middleName("middleName") },
+                new Object[] { "title", MyCustomerDraft.builder().title("title") },
+                new Object[] { "salutation", MyCustomerDraft.builder().salutation("salutation") },
+                new Object[] { "dateOfBirth", MyCustomerDraft.builder().dateOfBirth(LocalDate.parse("2023-06-01")) },
+                new Object[] { "companyName", MyCustomerDraft.builder().companyName("companyName") },
+                new Object[] { "vatId", MyCustomerDraft.builder().vatId("vatId") },
+                new Object[] { "addresses",
                         MyCustomerDraft.builder()
                                 .addresses(Collections
                                         .singletonList(new com.commercetools.api.models.common.BaseAddressImpl())) },
-                new Object[] { MyCustomerDraft.builder().defaultShippingAddress(4L) },
-                new Object[] { MyCustomerDraft.builder().defaultBillingAddress(3L) },
-                new Object[] { MyCustomerDraft.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { MyCustomerDraft.builder().locale("locale") },
-                new Object[] { MyCustomerDraft.builder()
-                        .stores(Collections.singletonList(
-                            new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) } };
+                new Object[] { "defaultShippingAddress", MyCustomerDraft.builder().defaultShippingAddress(4L) },
+                new Object[] { "defaultBillingAddress", MyCustomerDraft.builder().defaultBillingAddress(3L) },
+                new Object[] { "custom",
+                        MyCustomerDraft.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "locale", MyCustomerDraft.builder().locale("locale") },
+                new Object[] { "stores",
+                        MyCustomerDraft.builder()
+                                .stores(Collections.singletonList(
+                                    new com.commercetools.api.models.store.StoreResourceIdentifierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerRemoveAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerRemoveAddressActionTest.java
index 8a1f1c01030..7d1b0cc13f6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerRemoveAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerRemoveAddressActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerRemoveAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerRemoveAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerRemoveAddressActionBuilder builder) {
         MyCustomerRemoveAddressAction myCustomerRemoveAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerRemoveAddressAction).isInstanceOf(MyCustomerRemoveAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerRemoveAddressAction.builder().addressId("addressId") },
-                new Object[] { MyCustomerRemoveAddressAction.builder().addressKey("addressKey") } };
+        return new Object[][] {
+                new Object[] { "addressId", MyCustomerRemoveAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey", MyCustomerRemoveAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerRemoveBillingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerRemoveBillingAddressIdActionTest.java
index 9d9bb672607..0e060977c8a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerRemoveBillingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerRemoveBillingAddressIdActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerRemoveBillingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerRemoveBillingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerRemoveBillingAddressIdActionBuilder builder) {
         MyCustomerRemoveBillingAddressIdAction myCustomerRemoveBillingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerRemoveBillingAddressIdAction)
                 .isInstanceOf(MyCustomerRemoveBillingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyCustomerRemoveBillingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { MyCustomerRemoveBillingAddressIdAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId", MyCustomerRemoveBillingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        MyCustomerRemoveBillingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerRemoveShippingAddressIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerRemoveShippingAddressIdActionTest.java
index 8334642f84a..a2f023fafc5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerRemoveShippingAddressIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerRemoveShippingAddressIdActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerRemoveShippingAddressIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerRemoveShippingAddressIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerRemoveShippingAddressIdActionBuilder builder) {
         MyCustomerRemoveShippingAddressIdAction myCustomerRemoveShippingAddressIdAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerRemoveShippingAddressIdAction)
                 .isInstanceOf(MyCustomerRemoveShippingAddressIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyCustomerRemoveShippingAddressIdAction.builder().addressId("addressId") },
-                new Object[] { MyCustomerRemoveShippingAddressIdAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId", MyCustomerRemoveShippingAddressIdAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        MyCustomerRemoveShippingAddressIdAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetCompanyNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetCompanyNameActionTest.java
index af5ea008620..5e6a1515df0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetCompanyNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetCompanyNameActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetCompanyNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetCompanyNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetCompanyNameActionBuilder builder) {
         MyCustomerSetCompanyNameAction myCustomerSetCompanyNameAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetCompanyNameAction).isInstanceOf(MyCustomerSetCompanyNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerSetCompanyNameAction.builder().companyName("companyName") } };
+        return new Object[][] {
+                new Object[] { "companyName", MyCustomerSetCompanyNameAction.builder().companyName("companyName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetCustomFieldActionTest.java
index 7fe18da6dc0..46a5f10b45f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetCustomFieldActionBuilder builder) {
         MyCustomerSetCustomFieldAction myCustomerSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetCustomFieldAction).isInstanceOf(MyCustomerSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerSetCustomFieldAction.builder().name("name") },
-                new Object[] { MyCustomerSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", MyCustomerSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", MyCustomerSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetCustomTypeActionTest.java
index f7ff08f261d..85660b689f1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetCustomTypeActionBuilder builder) {
         MyCustomerSetCustomTypeAction myCustomerSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetCustomTypeAction).isInstanceOf(MyCustomerSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyCustomerSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { MyCustomerSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        MyCustomerSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", MyCustomerSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetDateOfBirthActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetDateOfBirthActionTest.java
index 11f75f60650..c5814b3182b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetDateOfBirthActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetDateOfBirthActionTest.java
@@ -3,31 +3,23 @@
 
 import java.time.LocalDate;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetDateOfBirthActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetDateOfBirthActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetDateOfBirthActionBuilder builder) {
         MyCustomerSetDateOfBirthAction myCustomerSetDateOfBirthAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetDateOfBirthAction).isInstanceOf(MyCustomerSetDateOfBirthAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { MyCustomerSetDateOfBirthAction.builder().dateOfBirth(LocalDate.parse("2023-06-01")) } };
+        return new Object[][] { new Object[] { "dateOfBirth",
+                MyCustomerSetDateOfBirthAction.builder().dateOfBirth(LocalDate.parse("2023-06-01")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetDefaultBillingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetDefaultBillingAddressActionTest.java
index effc9bbb1cb..65eafb60952 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetDefaultBillingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetDefaultBillingAddressActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetDefaultBillingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetDefaultBillingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetDefaultBillingAddressActionBuilder builder) {
         MyCustomerSetDefaultBillingAddressAction myCustomerSetDefaultBillingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetDefaultBillingAddressAction)
                 .isInstanceOf(MyCustomerSetDefaultBillingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyCustomerSetDefaultBillingAddressAction.builder().addressId("addressId") },
-                new Object[] { MyCustomerSetDefaultBillingAddressAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId", MyCustomerSetDefaultBillingAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        MyCustomerSetDefaultBillingAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetDefaultShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetDefaultShippingAddressActionTest.java
index 50021a7a700..80a76a85fc1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetDefaultShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetDefaultShippingAddressActionTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetDefaultShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetDefaultShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetDefaultShippingAddressActionBuilder builder) {
         MyCustomerSetDefaultShippingAddressAction myCustomerSetDefaultShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetDefaultShippingAddressAction)
                 .isInstanceOf(MyCustomerSetDefaultShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyCustomerSetDefaultShippingAddressAction.builder().addressId("addressId") },
-                new Object[] { MyCustomerSetDefaultShippingAddressAction.builder().addressKey("addressKey") } };
+                new Object[] { "addressId",
+                        MyCustomerSetDefaultShippingAddressAction.builder().addressId("addressId") },
+                new Object[] { "addressKey",
+                        MyCustomerSetDefaultShippingAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetFirstNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetFirstNameActionTest.java
index 72c875df729..b3c51ac6d75 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetFirstNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetFirstNameActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetFirstNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetFirstNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetFirstNameActionBuilder builder) {
         MyCustomerSetFirstNameAction myCustomerSetFirstNameAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetFirstNameAction).isInstanceOf(MyCustomerSetFirstNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerSetFirstNameAction.builder().firstName("firstName") } };
+        return new Object[][] {
+                new Object[] { "firstName", MyCustomerSetFirstNameAction.builder().firstName("firstName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetLastNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetLastNameActionTest.java
index c6465d63b37..fe19fd4defc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetLastNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetLastNameActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetLastNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetLastNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetLastNameActionBuilder builder) {
         MyCustomerSetLastNameAction myCustomerSetLastNameAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetLastNameAction).isInstanceOf(MyCustomerSetLastNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerSetLastNameAction.builder().lastName("lastName") } };
+        return new Object[][] {
+                new Object[] { "lastName", MyCustomerSetLastNameAction.builder().lastName("lastName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetLocaleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetLocaleActionTest.java
index b30c489afd8..0cf8497d71c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetLocaleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetLocaleActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetLocaleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetLocaleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetLocaleActionBuilder builder) {
         MyCustomerSetLocaleAction myCustomerSetLocaleAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetLocaleAction).isInstanceOf(MyCustomerSetLocaleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerSetLocaleAction.builder().locale("locale") } };
+        return new Object[][] { new Object[] { "locale", MyCustomerSetLocaleAction.builder().locale("locale") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetMiddleNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetMiddleNameActionTest.java
index 54bb2f771c3..4232648ee2a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetMiddleNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetMiddleNameActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetMiddleNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetMiddleNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetMiddleNameActionBuilder builder) {
         MyCustomerSetMiddleNameAction myCustomerSetMiddleNameAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetMiddleNameAction).isInstanceOf(MyCustomerSetMiddleNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerSetMiddleNameAction.builder().middleName("middleName") } };
+        return new Object[][] {
+                new Object[] { "middleName", MyCustomerSetMiddleNameAction.builder().middleName("middleName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetSalutationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetSalutationActionTest.java
index 2d8132a73da..99d85735475 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetSalutationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetSalutationActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetSalutationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetSalutationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetSalutationActionBuilder builder) {
         MyCustomerSetSalutationAction myCustomerSetSalutationAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetSalutationAction).isInstanceOf(MyCustomerSetSalutationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerSetSalutationAction.builder().salutation("salutation") } };
+        return new Object[][] {
+                new Object[] { "salutation", MyCustomerSetSalutationAction.builder().salutation("salutation") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetTitleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetTitleActionTest.java
index d208f57ac1d..633e85216d8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetTitleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetTitleActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetTitleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetTitleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetTitleActionBuilder builder) {
         MyCustomerSetTitleAction myCustomerSetTitleAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetTitleAction).isInstanceOf(MyCustomerSetTitleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerSetTitleAction.builder().title("title") } };
+        return new Object[][] { new Object[] { "title", MyCustomerSetTitleAction.builder().title("title") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetVatIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetVatIdActionTest.java
index 0b440feae61..cb30d908295 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetVatIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerSetVatIdActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerSetVatIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerSetVatIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerSetVatIdActionBuilder builder) {
         MyCustomerSetVatIdAction myCustomerSetVatIdAction = builder.buildUnchecked();
         Assertions.assertThat(myCustomerSetVatIdAction).isInstanceOf(MyCustomerSetVatIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerSetVatIdAction.builder().vatId("vatId") } };
+        return new Object[][] { new Object[] { "vatId", MyCustomerSetVatIdAction.builder().vatId("vatId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerUpdateTest.java
index c26f5111c47..0c507984d71 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyCustomerUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyCustomerUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyCustomerUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyCustomerUpdateBuilder builder) {
         MyCustomerUpdate myCustomerUpdate = builder.buildUnchecked();
         Assertions.assertThat(myCustomerUpdate).isInstanceOf(MyCustomerUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyCustomerUpdate.builder().version(2L) },
-                new Object[] { MyCustomerUpdate.builder()
-                        .actions(Collections
-                                .singletonList(new com.commercetools.api.models.me.MyCustomerUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", MyCustomerUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        MyCustomerUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.me.MyCustomerUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyDivisionDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyDivisionDraftTest.java
index 1358d3dbd0d..be1e66f4e17 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyDivisionDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyDivisionDraftTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyDivisionDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyDivisionDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyDivisionDraftBuilder builder) {
         MyDivisionDraft myDivisionDraft = builder.buildUnchecked();
         Assertions.assertThat(myDivisionDraft).isInstanceOf(MyDivisionDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyDivisionDraft.builder()
+        return new Object[][] { new Object[] { "parentUnit", MyDivisionDraft.builder()
                 .parentUnit(new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyLineItemDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyLineItemDraftTest.java
index 922500164c6..5daa2a12dbf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyLineItemDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyLineItemDraftTest.java
@@ -3,43 +3,36 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyLineItemDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyLineItemDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyLineItemDraftBuilder builder) {
         MyLineItemDraft myLineItemDraft = builder.buildUnchecked();
         Assertions.assertThat(myLineItemDraft).isInstanceOf(MyLineItemDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyLineItemDraft.builder().key("key") },
-                new Object[] { MyLineItemDraft.builder().productId("productId") },
-                new Object[] { MyLineItemDraft.builder().variantId(5L) },
-                new Object[] { MyLineItemDraft.builder().sku("sku") },
-                new Object[] { MyLineItemDraft.builder().quantity(8L) },
-                new Object[] { MyLineItemDraft.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { MyLineItemDraft.builder()
+        return new Object[][] { new Object[] { "key", MyLineItemDraft.builder().key("key") },
+                new Object[] { "productId", MyLineItemDraft.builder().productId("productId") },
+                new Object[] { "variantId", MyLineItemDraft.builder().variantId(5L) },
+                new Object[] { "sku", MyLineItemDraft.builder().sku("sku") },
+                new Object[] { "quantity", MyLineItemDraft.builder().quantity(8L) },
+                new Object[] { "addedAt", MyLineItemDraft.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "supplyChannel", MyLineItemDraft.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { MyLineItemDraft.builder()
-                        .distributionChannel(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { MyLineItemDraft.builder()
+                new Object[] { "distributionChannel",
+                        MyLineItemDraft.builder()
+                                .distributionChannel(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "shippingDetails", MyLineItemDraft.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) },
-                new Object[] { MyLineItemDraft.builder()
+                new Object[] { "custom", MyLineItemDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyOrderFromCartDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyOrderFromCartDraftTest.java
index 15d7caa8ccc..3a73898b699 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyOrderFromCartDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyOrderFromCartDraftTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyOrderFromCartDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyOrderFromCartDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyOrderFromCartDraftBuilder builder) {
         MyOrderFromCartDraft myOrderFromCartDraft = builder.buildUnchecked();
         Assertions.assertThat(myOrderFromCartDraft).isInstanceOf(MyOrderFromCartDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyOrderFromCartDraft.builder().id("id") },
-                new Object[] { MyOrderFromCartDraft.builder().version(2L) } };
+        return new Object[][] { new Object[] { "id", MyOrderFromCartDraft.builder().id("id") },
+                new Object[] { "version", MyOrderFromCartDraft.builder().version(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyOrderFromQuoteDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyOrderFromQuoteDraftTest.java
index b81a522bca8..693eefe07c1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyOrderFromQuoteDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyOrderFromQuoteDraftTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyOrderFromQuoteDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyOrderFromQuoteDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyOrderFromQuoteDraftBuilder builder) {
         MyOrderFromQuoteDraft myOrderFromQuoteDraft = builder.buildUnchecked();
         Assertions.assertThat(myOrderFromQuoteDraft).isInstanceOf(MyOrderFromQuoteDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyOrderFromQuoteDraft.builder().id("id") },
-                new Object[] { MyOrderFromQuoteDraft.builder().version(2L) },
-                new Object[] { MyOrderFromQuoteDraft.builder().quoteStateToAccepted(true) } };
+        return new Object[][] { new Object[] { "id", MyOrderFromQuoteDraft.builder().id("id") },
+                new Object[] { "version", MyOrderFromQuoteDraft.builder().version(2L) },
+                new Object[] { "quoteStateToAccepted", MyOrderFromQuoteDraft.builder().quoteStateToAccepted(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentAddTransactionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentAddTransactionActionTest.java
index aecab2f485c..523aeb0159e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentAddTransactionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentAddTransactionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyPaymentAddTransactionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyPaymentAddTransactionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyPaymentAddTransactionActionBuilder builder) {
         MyPaymentAddTransactionAction myPaymentAddTransactionAction = builder.buildUnchecked();
         Assertions.assertThat(myPaymentAddTransactionAction).isInstanceOf(MyPaymentAddTransactionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyPaymentAddTransactionAction.builder()
+        return new Object[][] { new Object[] { "transaction", MyPaymentAddTransactionAction.builder()
                 .transaction(new com.commercetools.api.models.payment.TransactionDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentChangeAmountPlannedActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentChangeAmountPlannedActionTest.java
index fa71ebc9977..d9937536742 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentChangeAmountPlannedActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentChangeAmountPlannedActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyPaymentChangeAmountPlannedActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyPaymentChangeAmountPlannedActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyPaymentChangeAmountPlannedActionBuilder builder) {
         MyPaymentChangeAmountPlannedAction myPaymentChangeAmountPlannedAction = builder.buildUnchecked();
         Assertions.assertThat(myPaymentChangeAmountPlannedAction)
                 .isInstanceOf(MyPaymentChangeAmountPlannedAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyPaymentChangeAmountPlannedAction.builder()
+        return new Object[][] { new Object[] { "amount", MyPaymentChangeAmountPlannedAction.builder()
                 .amount(new com.commercetools.api.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentDraftTest.java
index 4e0b9288faf..6c79794a888 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentDraftTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyPaymentDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyPaymentDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyPaymentDraftBuilder builder) {
         MyPaymentDraft myPaymentDraft = builder.buildUnchecked();
         Assertions.assertThat(myPaymentDraft).isInstanceOf(MyPaymentDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "amountPlanned",
                         MyPaymentDraft.builder().amountPlanned(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { MyPaymentDraft.builder()
-                        .paymentMethodInfo(new com.commercetools.api.models.payment.PaymentMethodInfoImpl()) },
-                new Object[] { MyPaymentDraft.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { MyPaymentDraft.builder()
+                new Object[] { "paymentMethodInfo",
+                        MyPaymentDraft.builder()
+                                .paymentMethodInfo(new com.commercetools.api.models.payment.PaymentMethodInfoImpl()) },
+                new Object[] { "custom",
+                        MyPaymentDraft.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "transaction", MyPaymentDraft.builder()
                         .transaction(new com.commercetools.api.models.me.MyTransactionDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentPagedQueryResponseTest.java
index 6d1036e5cf1..9bd08a92b36 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentPagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyPaymentPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyPaymentPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyPaymentPagedQueryResponseBuilder builder) {
         MyPaymentPagedQueryResponse myPaymentPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(myPaymentPagedQueryResponse).isInstanceOf(MyPaymentPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyPaymentPagedQueryResponse.builder().limit(7L) },
-                new Object[] { MyPaymentPagedQueryResponse.builder().count(2L) },
-                new Object[] { MyPaymentPagedQueryResponse.builder().total(1L) },
-                new Object[] { MyPaymentPagedQueryResponse.builder().offset(3L) },
-                new Object[] { MyPaymentPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", MyPaymentPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "count", MyPaymentPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", MyPaymentPagedQueryResponse.builder().total(1L) },
+                new Object[] { "offset", MyPaymentPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "results", MyPaymentPagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.me.MyPaymentImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetCustomFieldActionTest.java
index 642d1d5f1a1..858c0e437bb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyPaymentSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyPaymentSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyPaymentSetCustomFieldActionBuilder builder) {
         MyPaymentSetCustomFieldAction myPaymentSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(myPaymentSetCustomFieldAction).isInstanceOf(MyPaymentSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyPaymentSetCustomFieldAction.builder().name("name") },
-                new Object[] { MyPaymentSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", MyPaymentSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", MyPaymentSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetMethodInfoInterfaceActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetMethodInfoInterfaceActionTest.java
index 4b1b4c1e881..f149aec9f38 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetMethodInfoInterfaceActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetMethodInfoInterfaceActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyPaymentSetMethodInfoInterfaceActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyPaymentSetMethodInfoInterfaceActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyPaymentSetMethodInfoInterfaceActionBuilder builder) {
         MyPaymentSetMethodInfoInterfaceAction myPaymentSetMethodInfoInterfaceAction = builder.buildUnchecked();
         Assertions.assertThat(myPaymentSetMethodInfoInterfaceAction)
                 .isInstanceOf(MyPaymentSetMethodInfoInterfaceAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { MyPaymentSetMethodInfoInterfaceAction.builder()._interface("_interface") } };
+        return new Object[][] { new Object[] { "interface",
+                MyPaymentSetMethodInfoInterfaceAction.builder()._interface("_interface") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetMethodInfoMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetMethodInfoMethodActionTest.java
index 0e670188c88..63f1c132930 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetMethodInfoMethodActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetMethodInfoMethodActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyPaymentSetMethodInfoMethodActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyPaymentSetMethodInfoMethodActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyPaymentSetMethodInfoMethodActionBuilder builder) {
         MyPaymentSetMethodInfoMethodAction myPaymentSetMethodInfoMethodAction = builder.buildUnchecked();
         Assertions.assertThat(myPaymentSetMethodInfoMethodAction)
                 .isInstanceOf(MyPaymentSetMethodInfoMethodAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyPaymentSetMethodInfoMethodAction.builder().method("method") } };
+        return new Object[][] {
+                new Object[] { "method", MyPaymentSetMethodInfoMethodAction.builder().method("method") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetMethodInfoNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetMethodInfoNameActionTest.java
index 6ae2dfaf108..8c4a55783a6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetMethodInfoNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetMethodInfoNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyPaymentSetMethodInfoNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyPaymentSetMethodInfoNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyPaymentSetMethodInfoNameActionBuilder builder) {
         MyPaymentSetMethodInfoNameAction myPaymentSetMethodInfoNameAction = builder.buildUnchecked();
         Assertions.assertThat(myPaymentSetMethodInfoNameAction).isInstanceOf(MyPaymentSetMethodInfoNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyPaymentSetMethodInfoNameAction.builder()
+        return new Object[][] { new Object[] { "name", MyPaymentSetMethodInfoNameAction.builder()
                 .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetTransactionCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetTransactionCustomFieldActionTest.java
index 1842ad9b7c9..98d82b667c9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetTransactionCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentSetTransactionCustomFieldActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyPaymentSetTransactionCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyPaymentSetTransactionCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyPaymentSetTransactionCustomFieldActionBuilder builder) {
         MyPaymentSetTransactionCustomFieldAction myPaymentSetTransactionCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(myPaymentSetTransactionCustomFieldAction)
                 .isInstanceOf(MyPaymentSetTransactionCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyPaymentSetTransactionCustomFieldAction.builder().name("name") },
-                new Object[] { MyPaymentSetTransactionCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "name", MyPaymentSetTransactionCustomFieldAction.builder().name("name") },
+                new Object[] { "value", MyPaymentSetTransactionCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentTest.java
index daeec7d4625..3ac2fbe78b1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentTest.java
@@ -3,43 +3,39 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyPaymentTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyPaymentBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyPaymentBuilder builder) {
         MyPayment myPayment = builder.buildUnchecked();
         Assertions.assertThat(myPayment).isInstanceOf(MyPayment.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyPayment.builder().id("id") },
-                new Object[] { MyPayment.builder().version(2L) },
-                new Object[] { MyPayment.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { MyPayment.builder().anonymousId("anonymousId") },
-                new Object[] { MyPayment.builder()
-                        .amountPlanned(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { MyPayment.builder()
-                        .paymentMethodInfo(new com.commercetools.api.models.payment.PaymentMethodInfoImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", MyPayment.builder().id("id") },
+                new Object[] { "version", MyPayment.builder().version(2L) },
+                new Object[] { "customer",
+                        MyPayment.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "anonymousId", MyPayment.builder().anonymousId("anonymousId") },
+                new Object[] { "amountPlanned",
+                        MyPayment.builder()
+                                .amountPlanned(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "paymentMethodInfo",
+                        MyPayment.builder()
+                                .paymentMethodInfo(new com.commercetools.api.models.payment.PaymentMethodInfoImpl()) },
+                new Object[] { "transactions",
                         MyPayment.builder()
                                 .transactions(Collections
                                         .singletonList(new com.commercetools.api.models.payment.TransactionImpl())) },
-                new Object[] { MyPayment.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
+                new Object[] { "custom",
+                        MyPayment.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentUpdateTest.java
index c10420a7164..786f6d358e7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyPaymentUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyPaymentUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyPaymentUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyPaymentUpdateBuilder builder) {
         MyPaymentUpdate myPaymentUpdate = builder.buildUnchecked();
         Assertions.assertThat(myPaymentUpdate).isInstanceOf(MyPaymentUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyPaymentUpdate.builder().version(2L) },
-                new Object[] { MyPaymentUpdate.builder()
-                        .actions(Collections
-                                .singletonList(new com.commercetools.api.models.me.MyPaymentUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", MyPaymentUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        MyPaymentUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.me.MyPaymentUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteChangeMyQuoteStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteChangeMyQuoteStateActionTest.java
index 7dd8ed19bf5..8eaf33c4ae1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteChangeMyQuoteStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteChangeMyQuoteStateActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyQuoteChangeMyQuoteStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyQuoteChangeMyQuoteStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyQuoteChangeMyQuoteStateActionBuilder builder) {
         MyQuoteChangeMyQuoteStateAction myQuoteChangeMyQuoteStateAction = builder.buildUnchecked();
         Assertions.assertThat(myQuoteChangeMyQuoteStateAction).isInstanceOf(MyQuoteChangeMyQuoteStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyQuoteChangeMyQuoteStateAction.builder()
+        return new Object[][] { new Object[] { "quoteState", MyQuoteChangeMyQuoteStateAction.builder()
                 .quoteState(com.commercetools.api.models.me.MyQuoteState.findEnum("Declined")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteRequestCancelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteRequestCancelActionTest.java
index 3c7c364d065..b63364a3bc3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteRequestCancelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteRequestCancelActionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyQuoteRequestCancelActionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteRequestDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteRequestDraftTest.java
index 57c387d1303..e13fe21e520 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteRequestDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteRequestDraftTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyQuoteRequestDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyQuoteRequestDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyQuoteRequestDraftBuilder builder) {
         MyQuoteRequestDraft myQuoteRequestDraft = builder.buildUnchecked();
         Assertions.assertThat(myQuoteRequestDraft).isInstanceOf(MyQuoteRequestDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyQuoteRequestDraft.builder().cartId("cartId") },
-                new Object[] { MyQuoteRequestDraft.builder().cartVersion(7L) },
-                new Object[] { MyQuoteRequestDraft.builder().comment("comment") } };
+        return new Object[][] { new Object[] { "cartId", MyQuoteRequestDraft.builder().cartId("cartId") },
+                new Object[] { "cartVersion", MyQuoteRequestDraft.builder().cartVersion(7L) },
+                new Object[] { "comment", MyQuoteRequestDraft.builder().comment("comment") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteRequestUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteRequestUpdateTest.java
index baa17f9823f..db2240e1b7a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteRequestUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteRequestUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyQuoteRequestUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyQuoteRequestUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyQuoteRequestUpdateBuilder builder) {
         MyQuoteRequestUpdate myQuoteRequestUpdate = builder.buildUnchecked();
         Assertions.assertThat(myQuoteRequestUpdate).isInstanceOf(MyQuoteRequestUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyQuoteRequestUpdate.builder().version(2L) },
-                new Object[] { MyQuoteRequestUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.me.MyQuoteRequestUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", MyQuoteRequestUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        MyQuoteRequestUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.me.MyQuoteRequestUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteUpdateTest.java
index 1a5edef86f2..84df8e68bcf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyQuoteUpdateTest.java
@@ -3,32 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyQuoteUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyQuoteUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyQuoteUpdateBuilder builder) {
         MyQuoteUpdate myQuoteUpdate = builder.buildUnchecked();
         Assertions.assertThat(myQuoteUpdate).isInstanceOf(MyQuoteUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyQuoteUpdate.builder().version(2L) }, new Object[] { MyQuoteUpdate
-                .builder()
-                .actions(Collections.singletonList(new com.commercetools.api.models.me.MyQuoteUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", MyQuoteUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        MyQuoteUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.me.MyQuoteUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListAddLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListAddLineItemActionTest.java
index 296fb5372c1..3d3e9ade69c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListAddLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListAddLineItemActionTest.java
@@ -3,37 +3,29 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListAddLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListAddLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListAddLineItemActionBuilder builder) {
         MyShoppingListAddLineItemAction myShoppingListAddLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(myShoppingListAddLineItemAction).isInstanceOf(MyShoppingListAddLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyShoppingListAddLineItemAction.builder().key("key") },
-                new Object[] { MyShoppingListAddLineItemAction.builder().sku("sku") },
-                new Object[] { MyShoppingListAddLineItemAction.builder().productId("productId") },
-                new Object[] { MyShoppingListAddLineItemAction.builder().variantId(5L) },
-                new Object[] { MyShoppingListAddLineItemAction.builder().quantity(8L) },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", MyShoppingListAddLineItemAction.builder().key("key") },
+                new Object[] { "sku", MyShoppingListAddLineItemAction.builder().sku("sku") },
+                new Object[] { "productId", MyShoppingListAddLineItemAction.builder().productId("productId") },
+                new Object[] { "variantId", MyShoppingListAddLineItemAction.builder().variantId(5L) },
+                new Object[] { "quantity", MyShoppingListAddLineItemAction.builder().quantity(8L) },
+                new Object[] { "addedAt",
                         MyShoppingListAddLineItemAction.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { MyShoppingListAddLineItemAction.builder()
+                new Object[] { "custom", MyShoppingListAddLineItemAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListAddTextLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListAddTextLineItemActionTest.java
index 9a147a8737e..5c2e651b57d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListAddTextLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListAddTextLineItemActionTest.java
@@ -3,40 +3,35 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListAddTextLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListAddTextLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListAddTextLineItemActionBuilder builder) {
         MyShoppingListAddTextLineItemAction myShoppingListAddTextLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(myShoppingListAddTextLineItemAction)
                 .isInstanceOf(MyShoppingListAddTextLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyShoppingListAddTextLineItemAction.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { MyShoppingListAddTextLineItemAction.builder().key("key") },
-                new Object[] { MyShoppingListAddTextLineItemAction.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { MyShoppingListAddTextLineItemAction.builder().quantity(8L) },
-                new Object[] { MyShoppingListAddTextLineItemAction.builder()
-                        .addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { MyShoppingListAddTextLineItemAction.builder()
+                new Object[] { "name",
+                        MyShoppingListAddTextLineItemAction.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "key", MyShoppingListAddTextLineItemAction.builder().key("key") },
+                new Object[] { "description",
+                        MyShoppingListAddTextLineItemAction.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "quantity", MyShoppingListAddTextLineItemAction.builder().quantity(8L) },
+                new Object[] { "addedAt",
+                        MyShoppingListAddTextLineItemAction.builder()
+                                .addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "custom", MyShoppingListAddTextLineItemAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeLineItemQuantityActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeLineItemQuantityActionTest.java
index 85451e3e4be..9d41376ea26 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeLineItemQuantityActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeLineItemQuantityActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListChangeLineItemQuantityActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListChangeLineItemQuantityActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListChangeLineItemQuantityActionBuilder builder) {
         MyShoppingListChangeLineItemQuantityAction myShoppingListChangeLineItemQuantityAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myShoppingListChangeLineItemQuantityAction)
                 .isInstanceOf(MyShoppingListChangeLineItemQuantityAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyShoppingListChangeLineItemQuantityAction.builder().lineItemId("lineItemId") },
-                new Object[] { MyShoppingListChangeLineItemQuantityAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { MyShoppingListChangeLineItemQuantityAction.builder().quantity(8L) } };
+                new Object[] { "lineItemId",
+                        MyShoppingListChangeLineItemQuantityAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        MyShoppingListChangeLineItemQuantityAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "quantity", MyShoppingListChangeLineItemQuantityAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeLineItemsOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeLineItemsOrderActionTest.java
index 460d018bf96..3f94963a071 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeLineItemsOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeLineItemsOrderActionTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListChangeLineItemsOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListChangeLineItemsOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListChangeLineItemsOrderActionBuilder builder) {
         MyShoppingListChangeLineItemsOrderAction myShoppingListChangeLineItemsOrderAction = builder.buildUnchecked();
         Assertions.assertThat(myShoppingListChangeLineItemsOrderAction)
                 .isInstanceOf(MyShoppingListChangeLineItemsOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyShoppingListChangeLineItemsOrderAction.builder()
+        return new Object[][] { new Object[] { "lineItemOrder", MyShoppingListChangeLineItemsOrderAction.builder()
                 .lineItemOrder(Collections.singletonList("lineItemOrder")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeNameActionTest.java
index a2e9e9da66a..7fb75bd0a0a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListChangeNameActionBuilder builder) {
         MyShoppingListChangeNameAction myShoppingListChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(myShoppingListChangeNameAction).isInstanceOf(MyShoppingListChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyShoppingListChangeNameAction.builder()
+        return new Object[][] { new Object[] { "name", MyShoppingListChangeNameAction.builder()
                 .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeTextLineItemNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeTextLineItemNameActionTest.java
index c07046027ef..b5607df00fc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeTextLineItemNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeTextLineItemNameActionTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListChangeTextLineItemNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListChangeTextLineItemNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListChangeTextLineItemNameActionBuilder builder) {
         MyShoppingListChangeTextLineItemNameAction myShoppingListChangeTextLineItemNameAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myShoppingListChangeTextLineItemNameAction)
                 .isInstanceOf(MyShoppingListChangeTextLineItemNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyShoppingListChangeTextLineItemNameAction.builder().textLineItemId("textLineItemId") },
-                new Object[] {
+                new Object[] { "textLineItemId",
+                        MyShoppingListChangeTextLineItemNameAction.builder().textLineItemId("textLineItemId") },
+                new Object[] { "textLineItemKey",
                         MyShoppingListChangeTextLineItemNameAction.builder().textLineItemKey("textLineItemKey") },
-                new Object[] { MyShoppingListChangeTextLineItemNameAction.builder()
+                new Object[] { "name", MyShoppingListChangeTextLineItemNameAction.builder()
                         .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeTextLineItemQuantityActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeTextLineItemQuantityActionTest.java
index 29345f644fa..322b65b24c4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeTextLineItemQuantityActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeTextLineItemQuantityActionTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListChangeTextLineItemQuantityActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListChangeTextLineItemQuantityActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListChangeTextLineItemQuantityActionBuilder builder) {
         MyShoppingListChangeTextLineItemQuantityAction myShoppingListChangeTextLineItemQuantityAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myShoppingListChangeTextLineItemQuantityAction)
                 .isInstanceOf(MyShoppingListChangeTextLineItemQuantityAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "textLineItemId",
                         MyShoppingListChangeTextLineItemQuantityAction.builder().textLineItemId("textLineItemId") },
-                new Object[] {
+                new Object[] { "textLineItemKey",
                         MyShoppingListChangeTextLineItemQuantityAction.builder().textLineItemKey("textLineItemKey") },
-                new Object[] { MyShoppingListChangeTextLineItemQuantityAction.builder().quantity(8L) } };
+                new Object[] { "quantity", MyShoppingListChangeTextLineItemQuantityAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeTextLineItemsOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeTextLineItemsOrderActionTest.java
index a81ca94b6fb..ad7da30b08b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeTextLineItemsOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListChangeTextLineItemsOrderActionTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListChangeTextLineItemsOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListChangeTextLineItemsOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListChangeTextLineItemsOrderActionBuilder builder) {
         MyShoppingListChangeTextLineItemsOrderAction myShoppingListChangeTextLineItemsOrderAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myShoppingListChangeTextLineItemsOrderAction)
                 .isInstanceOf(MyShoppingListChangeTextLineItemsOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyShoppingListChangeTextLineItemsOrderAction.builder()
-                .textLineItemOrder(Collections.singletonList("textLineItemOrder")) } };
+        return new Object[][] {
+                new Object[] { "textLineItemOrder", MyShoppingListChangeTextLineItemsOrderAction.builder()
+                        .textLineItemOrder(Collections.singletonList("textLineItemOrder")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListDraftTest.java
index a720ea5c2a6..d099af34283 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListDraftTest.java
@@ -3,44 +3,42 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListDraftBuilder builder) {
         MyShoppingListDraft myShoppingListDraft = builder.buildUnchecked();
         Assertions.assertThat(myShoppingListDraft).isInstanceOf(MyShoppingListDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyShoppingListDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { MyShoppingListDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { MyShoppingListDraft.builder()
-                        .lineItems(Collections.singletonList(
-                            new com.commercetools.api.models.shopping_list.ShoppingListLineItemDraftImpl())) },
-                new Object[] { MyShoppingListDraft.builder()
-                        .textLineItems(Collections.singletonList(
-                            new com.commercetools.api.models.shopping_list.TextLineItemDraftImpl())) },
-                new Object[] { MyShoppingListDraft.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { MyShoppingListDraft.builder().deleteDaysAfterLastModification(3L) },
-                new Object[] { MyShoppingListDraft.builder()
+                new Object[] { "name",
+                        MyShoppingListDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
+                        MyShoppingListDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "lineItems",
+                        MyShoppingListDraft.builder()
+                                .lineItems(Collections.singletonList(
+                                    new com.commercetools.api.models.shopping_list.ShoppingListLineItemDraftImpl())) },
+                new Object[] { "textLineItems",
+                        MyShoppingListDraft.builder()
+                                .textLineItems(Collections.singletonList(
+                                    new com.commercetools.api.models.shopping_list.TextLineItemDraftImpl())) },
+                new Object[] { "custom",
+                        MyShoppingListDraft.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "deleteDaysAfterLastModification",
+                        MyShoppingListDraft.builder().deleteDaysAfterLastModification(3L) },
+                new Object[] { "store", MyShoppingListDraft.builder()
                         .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListRemoveLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListRemoveLineItemActionTest.java
index 8d29f336bfe..1a175151eff 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListRemoveLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListRemoveLineItemActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListRemoveLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListRemoveLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListRemoveLineItemActionBuilder builder) {
         MyShoppingListRemoveLineItemAction myShoppingListRemoveLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(myShoppingListRemoveLineItemAction)
                 .isInstanceOf(MyShoppingListRemoveLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyShoppingListRemoveLineItemAction.builder().lineItemId("lineItemId") },
-                new Object[] { MyShoppingListRemoveLineItemAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { MyShoppingListRemoveLineItemAction.builder().quantity(8L) } };
+        return new Object[][] {
+                new Object[] { "lineItemId", MyShoppingListRemoveLineItemAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", MyShoppingListRemoveLineItemAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "quantity", MyShoppingListRemoveLineItemAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListRemoveTextLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListRemoveTextLineItemActionTest.java
index 005cede483e..b4b93f378b5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListRemoveTextLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListRemoveTextLineItemActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListRemoveTextLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListRemoveTextLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListRemoveTextLineItemActionBuilder builder) {
         MyShoppingListRemoveTextLineItemAction myShoppingListRemoveTextLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(myShoppingListRemoveTextLineItemAction)
                 .isInstanceOf(MyShoppingListRemoveTextLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyShoppingListRemoveTextLineItemAction.builder().textLineItemId("textLineItemId") },
-                new Object[] { MyShoppingListRemoveTextLineItemAction.builder().textLineItemKey("textLineItemKey") },
-                new Object[] { MyShoppingListRemoveTextLineItemAction.builder().quantity(8L) } };
+                new Object[] { "textLineItemId",
+                        MyShoppingListRemoveTextLineItemAction.builder().textLineItemId("textLineItemId") },
+                new Object[] { "textLineItemKey",
+                        MyShoppingListRemoveTextLineItemAction.builder().textLineItemKey("textLineItemKey") },
+                new Object[] { "quantity", MyShoppingListRemoveTextLineItemAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetCustomFieldActionTest.java
index e40c599a1db..3b7f1e62ef7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetCustomFieldActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListSetCustomFieldActionBuilder builder) {
         MyShoppingListSetCustomFieldAction myShoppingListSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(myShoppingListSetCustomFieldAction)
                 .isInstanceOf(MyShoppingListSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyShoppingListSetCustomFieldAction.builder().name("name") },
-                new Object[] { MyShoppingListSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", MyShoppingListSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", MyShoppingListSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetCustomTypeActionTest.java
index 14aff14c258..3a3b3645dae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListSetCustomTypeActionBuilder builder) {
         MyShoppingListSetCustomTypeAction myShoppingListSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(myShoppingListSetCustomTypeAction).isInstanceOf(MyShoppingListSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyShoppingListSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { MyShoppingListSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        MyShoppingListSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", MyShoppingListSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetDeleteDaysAfterLastModificationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetDeleteDaysAfterLastModificationActionTest.java
index cf9e179b69b..96543ed6ac4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetDeleteDaysAfterLastModificationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetDeleteDaysAfterLastModificationActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListSetDeleteDaysAfterLastModificationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListSetDeleteDaysAfterLastModificationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListSetDeleteDaysAfterLastModificationActionBuilder builder) {
         MyShoppingListSetDeleteDaysAfterLastModificationAction myShoppingListSetDeleteDaysAfterLastModificationAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myShoppingListSetDeleteDaysAfterLastModificationAction)
                 .isInstanceOf(MyShoppingListSetDeleteDaysAfterLastModificationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyShoppingListSetDeleteDaysAfterLastModificationAction.builder()
-                .deleteDaysAfterLastModification(3L) } };
+        return new Object[][] { new Object[] { "deleteDaysAfterLastModification",
+                MyShoppingListSetDeleteDaysAfterLastModificationAction.builder()
+                        .deleteDaysAfterLastModification(3L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetDescriptionActionTest.java
index 27e856932e8..80e23857897 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetDescriptionActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListSetDescriptionActionBuilder builder) {
         MyShoppingListSetDescriptionAction myShoppingListSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(myShoppingListSetDescriptionAction)
                 .isInstanceOf(MyShoppingListSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyShoppingListSetDescriptionAction.builder()
+        return new Object[][] { new Object[] { "description", MyShoppingListSetDescriptionAction.builder()
                 .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetLineItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetLineItemCustomFieldActionTest.java
index 852694faae4..f5fc196d3a3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetLineItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetLineItemCustomFieldActionTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListSetLineItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListSetLineItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListSetLineItemCustomFieldActionBuilder builder) {
         MyShoppingListSetLineItemCustomFieldAction myShoppingListSetLineItemCustomFieldAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myShoppingListSetLineItemCustomFieldAction)
                 .isInstanceOf(MyShoppingListSetLineItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyShoppingListSetLineItemCustomFieldAction.builder().lineItemId("lineItemId") },
-                new Object[] { MyShoppingListSetLineItemCustomFieldAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { MyShoppingListSetLineItemCustomFieldAction.builder().name("name") },
-                new Object[] { MyShoppingListSetLineItemCustomFieldAction.builder().value("value") } };
+                new Object[] { "lineItemId",
+                        MyShoppingListSetLineItemCustomFieldAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        MyShoppingListSetLineItemCustomFieldAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "name", MyShoppingListSetLineItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", MyShoppingListSetLineItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetLineItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetLineItemCustomTypeActionTest.java
index 2c99da13aa6..9afc0ec83a2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetLineItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetLineItemCustomTypeActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListSetLineItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListSetLineItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListSetLineItemCustomTypeActionBuilder builder) {
         MyShoppingListSetLineItemCustomTypeAction myShoppingListSetLineItemCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(myShoppingListSetLineItemCustomTypeAction)
                 .isInstanceOf(MyShoppingListSetLineItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyShoppingListSetLineItemCustomTypeAction.builder().lineItemId("lineItemId") },
-                new Object[] { MyShoppingListSetLineItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { MyShoppingListSetLineItemCustomTypeAction.builder()
+                new Object[] { "lineItemId",
+                        MyShoppingListSetLineItemCustomTypeAction.builder().lineItemId("lineItemId") },
+                new Object[] { "type",
+                        MyShoppingListSetLineItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", MyShoppingListSetLineItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetTextLineItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetTextLineItemCustomFieldActionTest.java
index 9abb1e043bb..c288825fdf0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetTextLineItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetTextLineItemCustomFieldActionTest.java
@@ -1,38 +1,30 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListSetTextLineItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListSetTextLineItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListSetTextLineItemCustomFieldActionBuilder builder) {
         MyShoppingListSetTextLineItemCustomFieldAction myShoppingListSetTextLineItemCustomFieldAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myShoppingListSetTextLineItemCustomFieldAction)
                 .isInstanceOf(MyShoppingListSetTextLineItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "textLineItemId",
                         MyShoppingListSetTextLineItemCustomFieldAction.builder().textLineItemId("textLineItemId") },
-                new Object[] {
+                new Object[] { "textLineItemKey",
                         MyShoppingListSetTextLineItemCustomFieldAction.builder().textLineItemKey("textLineItemKey") },
-                new Object[] { MyShoppingListSetTextLineItemCustomFieldAction.builder().name("name") },
-                new Object[] { MyShoppingListSetTextLineItemCustomFieldAction.builder().value("value") } };
+                new Object[] { "name", MyShoppingListSetTextLineItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", MyShoppingListSetTextLineItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetTextLineItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetTextLineItemCustomTypeActionTest.java
index 446d91c30c0..4c9ba4427fb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetTextLineItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetTextLineItemCustomTypeActionTest.java
@@ -1,39 +1,32 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListSetTextLineItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListSetTextLineItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListSetTextLineItemCustomTypeActionBuilder builder) {
         MyShoppingListSetTextLineItemCustomTypeAction myShoppingListSetTextLineItemCustomTypeAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myShoppingListSetTextLineItemCustomTypeAction)
                 .isInstanceOf(MyShoppingListSetTextLineItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "textLineItemId",
                         MyShoppingListSetTextLineItemCustomTypeAction.builder().textLineItemId("textLineItemId") },
-                new Object[] {
+                new Object[] { "textLineItemKey",
                         MyShoppingListSetTextLineItemCustomTypeAction.builder().textLineItemKey("textLineItemKey") },
-                new Object[] { MyShoppingListSetTextLineItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { MyShoppingListSetTextLineItemCustomTypeAction.builder()
+                new Object[] { "type",
+                        MyShoppingListSetTextLineItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", MyShoppingListSetTextLineItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetTextLineItemDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetTextLineItemDescriptionActionTest.java
index 17471c84539..b9100ef6ccb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetTextLineItemDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListSetTextLineItemDescriptionActionTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListSetTextLineItemDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListSetTextLineItemDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListSetTextLineItemDescriptionActionBuilder builder) {
         MyShoppingListSetTextLineItemDescriptionAction myShoppingListSetTextLineItemDescriptionAction = builder
                 .buildUnchecked();
         Assertions.assertThat(myShoppingListSetTextLineItemDescriptionAction)
                 .isInstanceOf(MyShoppingListSetTextLineItemDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "textLineItemId",
                         MyShoppingListSetTextLineItemDescriptionAction.builder().textLineItemId("textLineItemId") },
-                new Object[] {
+                new Object[] { "textLineItemKey",
                         MyShoppingListSetTextLineItemDescriptionAction.builder().textLineItemKey("textLineItemKey") },
-                new Object[] { MyShoppingListSetTextLineItemDescriptionAction.builder()
+                new Object[] { "description", MyShoppingListSetTextLineItemDescriptionAction.builder()
                         .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListUpdateTest.java
index 8843ddd3a97..ee79151cda4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyShoppingListUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyShoppingListUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyShoppingListUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyShoppingListUpdateBuilder builder) {
         MyShoppingListUpdate myShoppingListUpdate = builder.buildUnchecked();
         Assertions.assertThat(myShoppingListUpdate).isInstanceOf(MyShoppingListUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MyShoppingListUpdate.builder().version(2L) },
-                new Object[] { MyShoppingListUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.me.MyShoppingListUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", MyShoppingListUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        MyShoppingListUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.me.MyShoppingListUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyTransactionDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyTransactionDraftTest.java
index 149d5a41055..f8f3d0c736f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyTransactionDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/MyTransactionDraftTest.java
@@ -3,37 +3,31 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MyTransactionDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MyTransactionDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MyTransactionDraftBuilder builder) {
         MyTransactionDraft myTransactionDraft = builder.buildUnchecked();
         Assertions.assertThat(myTransactionDraft).isInstanceOf(MyTransactionDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MyTransactionDraft.builder().timestamp(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { MyTransactionDraft.builder()
-                        .type(com.commercetools.api.models.payment.TransactionType.findEnum("Authorization")) },
-                new Object[] {
+                new Object[] { "timestamp",
+                        MyTransactionDraft.builder().timestamp(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "type",
+                        MyTransactionDraft.builder()
+                                .type(com.commercetools.api.models.payment.TransactionType.findEnum("Authorization")) },
+                new Object[] { "amount",
                         MyTransactionDraft.builder().amount(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { MyTransactionDraft.builder().interactionId("interactionId") },
-                new Object[] { MyTransactionDraft.builder()
+                new Object[] { "interactionId", MyTransactionDraft.builder().interactionId("interactionId") },
+                new Object[] { "custom", MyTransactionDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/ReplicaMyCartDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/ReplicaMyCartDraftTest.java
index b386312f0df..3417cf98ba0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/ReplicaMyCartDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/me/ReplicaMyCartDraftTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.me;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReplicaMyCartDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReplicaMyCartDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReplicaMyCartDraftBuilder builder) {
         ReplicaMyCartDraft replicaMyCartDraft = builder.buildUnchecked();
         Assertions.assertThat(replicaMyCartDraft).isInstanceOf(ReplicaMyCartDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReplicaMyCartDraft.builder().reference("reference") } };
+        return new Object[][] { new Object[] { "reference", ReplicaMyCartDraft.builder().reference("reference") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowApprovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowApprovedMessagePayloadTest.java
index feecfce99ff..1e8bb433515 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowApprovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowApprovedMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowApprovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowApprovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowApprovedMessagePayloadBuilder builder) {
         ApprovalFlowApprovedMessagePayload approvalFlowApprovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowApprovedMessagePayload)
                 .isInstanceOf(ApprovalFlowApprovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalFlowApprovedMessagePayload.builder()
-                        .associate(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { ApprovalFlowApprovedMessagePayload.builder()
+                new Object[] { "associate",
+                        ApprovalFlowApprovedMessagePayload.builder()
+                                .associate(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "order", ApprovalFlowApprovedMessagePayload.builder()
                         .order(new com.commercetools.api.models.order.OrderReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowApprovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowApprovedMessageTest.java
index 85a56f45bb2..5bf19e94e58 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowApprovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowApprovedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowApprovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowApprovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowApprovedMessageBuilder builder) {
         ApprovalFlowApprovedMessage approvalFlowApprovedMessage = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowApprovedMessage).isInstanceOf(ApprovalFlowApprovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalFlowApprovedMessage.builder()
-                        .associate(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { ApprovalFlowApprovedMessage.builder()
+                new Object[] { "associate",
+                        ApprovalFlowApprovedMessage.builder()
+                                .associate(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "order", ApprovalFlowApprovedMessage.builder()
                         .order(new com.commercetools.api.models.order.OrderReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCompletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCompletedMessagePayloadTest.java
index f9c78621355..99dd5e0c7a2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCompletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCompletedMessagePayloadTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowCompletedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowCompletedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowCompletedMessagePayloadBuilder builder) {
         ApprovalFlowCompletedMessagePayload approvalFlowCompletedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowCompletedMessagePayload)
                 .isInstanceOf(ApprovalFlowCompletedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalFlowCompletedMessagePayload.builder()
-                        .status(com.commercetools.api.models.approval_flow.ApprovalFlowStatus.findEnum("Pending")) },
-                new Object[] { ApprovalFlowCompletedMessagePayload.builder()
+                new Object[] { "status",
+                        ApprovalFlowCompletedMessagePayload.builder()
+                                .status(com.commercetools.api.models.approval_flow.ApprovalFlowStatus
+                                        .findEnum("Pending")) },
+                new Object[] { "order", ApprovalFlowCompletedMessagePayload.builder()
                         .order(new com.commercetools.api.models.order.OrderReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCompletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCompletedMessageTest.java
index 2586f9c7660..928f92fd5a7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCompletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCompletedMessageTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowCompletedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowCompletedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowCompletedMessageBuilder builder) {
         ApprovalFlowCompletedMessage approvalFlowCompletedMessage = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowCompletedMessage).isInstanceOf(ApprovalFlowCompletedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalFlowCompletedMessage.builder()
-                        .status(com.commercetools.api.models.approval_flow.ApprovalFlowStatus.findEnum("Pending")) },
-                new Object[] { ApprovalFlowCompletedMessage.builder()
+                new Object[] { "status",
+                        ApprovalFlowCompletedMessage.builder()
+                                .status(com.commercetools.api.models.approval_flow.ApprovalFlowStatus
+                                        .findEnum("Pending")) },
+                new Object[] { "order", ApprovalFlowCompletedMessage.builder()
                         .order(new com.commercetools.api.models.order.OrderReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCreatedMessagePayloadTest.java
index 4e093053a7e..c0b7491f570 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowCreatedMessagePayloadBuilder builder) {
         ApprovalFlowCreatedMessagePayload approvalFlowCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowCreatedMessagePayload).isInstanceOf(ApprovalFlowCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalFlowCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "approvalFlow", ApprovalFlowCreatedMessagePayload.builder()
                 .approvalFlow(new com.commercetools.api.models.approval_flow.ApprovalFlowImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCreatedMessageTest.java
index c696b330720..eb631bdde09 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowCreatedMessageBuilder builder) {
         ApprovalFlowCreatedMessage approvalFlowCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowCreatedMessage).isInstanceOf(ApprovalFlowCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalFlowCreatedMessage.builder()
+        return new Object[][] { new Object[] { "approvalFlow", ApprovalFlowCreatedMessage.builder()
                 .approvalFlow(new com.commercetools.api.models.approval_flow.ApprovalFlowImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowRejectedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowRejectedMessagePayloadTest.java
index 36a03f450c2..e221031be95 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowRejectedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowRejectedMessagePayloadTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowRejectedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowRejectedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowRejectedMessagePayloadBuilder builder) {
         ApprovalFlowRejectedMessagePayload approvalFlowRejectedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowRejectedMessagePayload)
                 .isInstanceOf(ApprovalFlowRejectedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalFlowRejectedMessagePayload.builder()
-                        .associate(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { ApprovalFlowRejectedMessagePayload.builder().rejectionReason("rejectionReason") },
-                new Object[] { ApprovalFlowRejectedMessagePayload.builder()
+                new Object[] { "associate",
+                        ApprovalFlowRejectedMessagePayload.builder()
+                                .associate(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "rejectionReason",
+                        ApprovalFlowRejectedMessagePayload.builder().rejectionReason("rejectionReason") },
+                new Object[] { "order", ApprovalFlowRejectedMessagePayload.builder()
                         .order(new com.commercetools.api.models.order.OrderReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowRejectedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowRejectedMessageTest.java
index c013efaf954..9513539d80d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowRejectedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalFlowRejectedMessageTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalFlowRejectedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalFlowRejectedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalFlowRejectedMessageBuilder builder) {
         ApprovalFlowRejectedMessage approvalFlowRejectedMessage = builder.buildUnchecked();
         Assertions.assertThat(approvalFlowRejectedMessage).isInstanceOf(ApprovalFlowRejectedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalFlowRejectedMessage.builder()
-                        .associate(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { ApprovalFlowRejectedMessage.builder().rejectionReason("rejectionReason") },
-                new Object[] { ApprovalFlowRejectedMessage.builder()
+                new Object[] { "associate",
+                        ApprovalFlowRejectedMessage.builder()
+                                .associate(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "rejectionReason",
+                        ApprovalFlowRejectedMessage.builder().rejectionReason("rejectionReason") },
+                new Object[] { "order", ApprovalFlowRejectedMessage.builder()
                         .order(new com.commercetools.api.models.order.OrderReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleApproversSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleApproversSetMessagePayloadTest.java
index 42158544184..1e78a907398 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleApproversSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleApproversSetMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleApproversSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleApproversSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleApproversSetMessagePayloadBuilder builder) {
         ApprovalRuleApproversSetMessagePayload approvalRuleApproversSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleApproversSetMessagePayload)
                 .isInstanceOf(ApprovalRuleApproversSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalRuleApproversSetMessagePayload.builder()
-                        .approvers(new com.commercetools.api.models.approval_rule.ApproverHierarchyImpl()) },
-                new Object[] { ApprovalRuleApproversSetMessagePayload.builder()
+                new Object[] { "approvers",
+                        ApprovalRuleApproversSetMessagePayload.builder()
+                                .approvers(new com.commercetools.api.models.approval_rule.ApproverHierarchyImpl()) },
+                new Object[] { "oldApprovers", ApprovalRuleApproversSetMessagePayload.builder()
                         .oldApprovers(new com.commercetools.api.models.approval_rule.ApproverHierarchyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleApproversSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleApproversSetMessageTest.java
index 34e48f4596e..7afa5654bd1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleApproversSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleApproversSetMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleApproversSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleApproversSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleApproversSetMessageBuilder builder) {
         ApprovalRuleApproversSetMessage approvalRuleApproversSetMessage = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleApproversSetMessage).isInstanceOf(ApprovalRuleApproversSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalRuleApproversSetMessage.builder()
-                        .approvers(new com.commercetools.api.models.approval_rule.ApproverHierarchyImpl()) },
-                new Object[] { ApprovalRuleApproversSetMessage.builder()
+                new Object[] { "approvers",
+                        ApprovalRuleApproversSetMessage.builder()
+                                .approvers(new com.commercetools.api.models.approval_rule.ApproverHierarchyImpl()) },
+                new Object[] { "oldApprovers", ApprovalRuleApproversSetMessage.builder()
                         .oldApprovers(new com.commercetools.api.models.approval_rule.ApproverHierarchyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleCreatedMessagePayloadTest.java
index 0b568eeeaf1..8059ebef4fe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleCreatedMessagePayloadBuilder builder) {
         ApprovalRuleCreatedMessagePayload approvalRuleCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleCreatedMessagePayload).isInstanceOf(ApprovalRuleCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "approvalRule", ApprovalRuleCreatedMessagePayload.builder()
                 .approvalRule(new com.commercetools.api.models.approval_rule.ApprovalRuleImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleCreatedMessageTest.java
index 8bd1e07a2ad..bf2c6902f2b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleCreatedMessageBuilder builder) {
         ApprovalRuleCreatedMessage approvalRuleCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleCreatedMessage).isInstanceOf(ApprovalRuleCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleCreatedMessage.builder()
+        return new Object[][] { new Object[] { "approvalRule", ApprovalRuleCreatedMessage.builder()
                 .approvalRule(new com.commercetools.api.models.approval_rule.ApprovalRuleImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleDescriptionSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleDescriptionSetMessagePayloadTest.java
index 15e10bff977..fcca49d7f66 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleDescriptionSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleDescriptionSetMessagePayloadTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleDescriptionSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleDescriptionSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleDescriptionSetMessagePayloadBuilder builder) {
         ApprovalRuleDescriptionSetMessagePayload approvalRuleDescriptionSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleDescriptionSetMessagePayload)
                 .isInstanceOf(ApprovalRuleDescriptionSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalRuleDescriptionSetMessagePayload.builder().description("description") },
-                new Object[] { ApprovalRuleDescriptionSetMessagePayload.builder().oldDescription("oldDescription") } };
+                new Object[] { "description",
+                        ApprovalRuleDescriptionSetMessagePayload.builder().description("description") },
+                new Object[] { "oldDescription",
+                        ApprovalRuleDescriptionSetMessagePayload.builder().oldDescription("oldDescription") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleDescriptionSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleDescriptionSetMessageTest.java
index 72418fea3a5..07e6a6a0f99 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleDescriptionSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleDescriptionSetMessageTest.java
@@ -1,31 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleDescriptionSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleDescriptionSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleDescriptionSetMessageBuilder builder) {
         ApprovalRuleDescriptionSetMessage approvalRuleDescriptionSetMessage = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleDescriptionSetMessage).isInstanceOf(ApprovalRuleDescriptionSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleDescriptionSetMessage.builder().description("description") },
-                new Object[] { ApprovalRuleDescriptionSetMessage.builder().oldDescription("oldDescription") } };
+        return new Object[][] {
+                new Object[] { "description", ApprovalRuleDescriptionSetMessage.builder().description("description") },
+                new Object[] { "oldDescription",
+                        ApprovalRuleDescriptionSetMessage.builder().oldDescription("oldDescription") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleKeySetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleKeySetMessagePayloadTest.java
index 8543ed319b0..80c54f744f1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleKeySetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleKeySetMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleKeySetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleKeySetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleKeySetMessagePayloadBuilder builder) {
         ApprovalRuleKeySetMessagePayload approvalRuleKeySetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleKeySetMessagePayload).isInstanceOf(ApprovalRuleKeySetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleKeySetMessagePayload.builder().key("key") },
-                new Object[] { ApprovalRuleKeySetMessagePayload.builder().oldKey("oldKey") } };
+        return new Object[][] { new Object[] { "key", ApprovalRuleKeySetMessagePayload.builder().key("key") },
+                new Object[] { "oldKey", ApprovalRuleKeySetMessagePayload.builder().oldKey("oldKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleKeySetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleKeySetMessageTest.java
index 8850d5ff48f..7a0462886a2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleKeySetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleKeySetMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleKeySetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleKeySetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleKeySetMessageBuilder builder) {
         ApprovalRuleKeySetMessage approvalRuleKeySetMessage = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleKeySetMessage).isInstanceOf(ApprovalRuleKeySetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleKeySetMessage.builder().key("key") },
-                new Object[] { ApprovalRuleKeySetMessage.builder().oldKey("oldKey") } };
+        return new Object[][] { new Object[] { "key", ApprovalRuleKeySetMessage.builder().key("key") },
+                new Object[] { "oldKey", ApprovalRuleKeySetMessage.builder().oldKey("oldKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleNameSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleNameSetMessagePayloadTest.java
index c81eff7d646..dd755c037ff 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleNameSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleNameSetMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleNameSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleNameSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleNameSetMessagePayloadBuilder builder) {
         ApprovalRuleNameSetMessagePayload approvalRuleNameSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleNameSetMessagePayload).isInstanceOf(ApprovalRuleNameSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleNameSetMessagePayload.builder().name("name") },
-                new Object[] { ApprovalRuleNameSetMessagePayload.builder().oldName("oldName") } };
+        return new Object[][] { new Object[] { "name", ApprovalRuleNameSetMessagePayload.builder().name("name") },
+                new Object[] { "oldName", ApprovalRuleNameSetMessagePayload.builder().oldName("oldName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleNameSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleNameSetMessageTest.java
index db33b97f2a6..5eabd45d6f2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleNameSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleNameSetMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleNameSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleNameSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleNameSetMessageBuilder builder) {
         ApprovalRuleNameSetMessage approvalRuleNameSetMessage = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleNameSetMessage).isInstanceOf(ApprovalRuleNameSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRuleNameSetMessage.builder().name("name") },
-                new Object[] { ApprovalRuleNameSetMessage.builder().oldName("oldName") } };
+        return new Object[][] { new Object[] { "name", ApprovalRuleNameSetMessage.builder().name("name") },
+                new Object[] { "oldName", ApprovalRuleNameSetMessage.builder().oldName("oldName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRulePredicateSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRulePredicateSetMessagePayloadTest.java
index a5363afd77d..10592031899 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRulePredicateSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRulePredicateSetMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRulePredicateSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRulePredicateSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRulePredicateSetMessagePayloadBuilder builder) {
         ApprovalRulePredicateSetMessagePayload approvalRulePredicateSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(approvalRulePredicateSetMessagePayload)
                 .isInstanceOf(ApprovalRulePredicateSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalRulePredicateSetMessagePayload.builder().predicate("predicate") },
-                new Object[] { ApprovalRulePredicateSetMessagePayload.builder().oldPredicate("oldPredicate") } };
+                new Object[] { "predicate", ApprovalRulePredicateSetMessagePayload.builder().predicate("predicate") },
+                new Object[] { "oldPredicate",
+                        ApprovalRulePredicateSetMessagePayload.builder().oldPredicate("oldPredicate") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRulePredicateSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRulePredicateSetMessageTest.java
index 639e08cfaec..34fae6d226d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRulePredicateSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRulePredicateSetMessageTest.java
@@ -1,31 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRulePredicateSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRulePredicateSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRulePredicateSetMessageBuilder builder) {
         ApprovalRulePredicateSetMessage approvalRulePredicateSetMessage = builder.buildUnchecked();
         Assertions.assertThat(approvalRulePredicateSetMessage).isInstanceOf(ApprovalRulePredicateSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ApprovalRulePredicateSetMessage.builder().predicate("predicate") },
-                new Object[] { ApprovalRulePredicateSetMessage.builder().oldPredicate("oldPredicate") } };
+        return new Object[][] {
+                new Object[] { "predicate", ApprovalRulePredicateSetMessage.builder().predicate("predicate") },
+                new Object[] { "oldPredicate",
+                        ApprovalRulePredicateSetMessage.builder().oldPredicate("oldPredicate") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleRequestersSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleRequestersSetMessagePayloadTest.java
index 765662b1dfa..c1bc07c78dd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleRequestersSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleRequestersSetMessagePayloadTest.java
@@ -3,37 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleRequestersSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleRequestersSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleRequestersSetMessagePayloadBuilder builder) {
         ApprovalRuleRequestersSetMessagePayload approvalRuleRequestersSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleRequestersSetMessagePayload)
                 .isInstanceOf(ApprovalRuleRequestersSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalRuleRequestersSetMessagePayload.builder()
-                        .requesters(Collections
-                                .singletonList(new com.commercetools.api.models.approval_rule.RuleRequesterImpl())) },
-                new Object[] { ApprovalRuleRequestersSetMessagePayload.builder()
-                        .oldRequesters(Collections
-                                .singletonList(new com.commercetools.api.models.approval_rule.RuleRequesterImpl())) } };
+                new Object[] { "requesters",
+                        ApprovalRuleRequestersSetMessagePayload.builder()
+                                .requesters(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_rule.RuleRequesterImpl())) },
+                new Object[] { "oldRequesters",
+                        ApprovalRuleRequestersSetMessagePayload.builder()
+                                .oldRequesters(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_rule.RuleRequesterImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleRequestersSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleRequestersSetMessageTest.java
index ae85f20d41d..025b57f9996 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleRequestersSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleRequestersSetMessageTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleRequestersSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleRequestersSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleRequestersSetMessageBuilder builder) {
         ApprovalRuleRequestersSetMessage approvalRuleRequestersSetMessage = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleRequestersSetMessage).isInstanceOf(ApprovalRuleRequestersSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalRuleRequestersSetMessage.builder()
-                        .requesters(Collections
-                                .singletonList(new com.commercetools.api.models.approval_rule.RuleRequesterImpl())) },
-                new Object[] { ApprovalRuleRequestersSetMessage.builder()
-                        .oldRequesters(Collections
-                                .singletonList(new com.commercetools.api.models.approval_rule.RuleRequesterImpl())) } };
+                new Object[] { "requesters",
+                        ApprovalRuleRequestersSetMessage.builder()
+                                .requesters(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_rule.RuleRequesterImpl())) },
+                new Object[] { "oldRequesters",
+                        ApprovalRuleRequestersSetMessage.builder()
+                                .oldRequesters(Collections.singletonList(
+                                    new com.commercetools.api.models.approval_rule.RuleRequesterImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleStatusSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleStatusSetMessagePayloadTest.java
index cd49005cef8..8499aec17de 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleStatusSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleStatusSetMessagePayloadTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleStatusSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleStatusSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleStatusSetMessagePayloadBuilder builder) {
         ApprovalRuleStatusSetMessagePayload approvalRuleStatusSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleStatusSetMessagePayload)
                 .isInstanceOf(ApprovalRuleStatusSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalRuleStatusSetMessagePayload.builder()
+                new Object[] { "status", ApprovalRuleStatusSetMessagePayload.builder()
                         .status(com.commercetools.api.models.approval_rule.ApprovalRuleStatus.findEnum("Active")) },
-                new Object[] { ApprovalRuleStatusSetMessagePayload.builder()
+                new Object[] { "oldStatus", ApprovalRuleStatusSetMessagePayload.builder()
                         .oldStatus(
                             com.commercetools.api.models.approval_rule.ApprovalRuleStatus.findEnum("Active")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleStatusSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleStatusSetMessageTest.java
index edd4afa5e92..d83d57c9b8e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleStatusSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ApprovalRuleStatusSetMessageTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ApprovalRuleStatusSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ApprovalRuleStatusSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ApprovalRuleStatusSetMessageBuilder builder) {
         ApprovalRuleStatusSetMessage approvalRuleStatusSetMessage = builder.buildUnchecked();
         Assertions.assertThat(approvalRuleStatusSetMessage).isInstanceOf(ApprovalRuleStatusSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ApprovalRuleStatusSetMessage.builder()
+                new Object[] { "status", ApprovalRuleStatusSetMessage.builder()
                         .status(com.commercetools.api.models.approval_rule.ApprovalRuleStatus.findEnum("Active")) },
-                new Object[] { ApprovalRuleStatusSetMessage.builder()
+                new Object[] { "oldStatus", ApprovalRuleStatusSetMessage.builder()
                         .oldStatus(
                             com.commercetools.api.models.approval_rule.ApprovalRuleStatus.findEnum("Active")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleBuyerAssignableChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleBuyerAssignableChangedMessagePayloadTest.java
index 6836f6ad046..cc7fddc0919 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleBuyerAssignableChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleBuyerAssignableChangedMessagePayloadTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleBuyerAssignableChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleBuyerAssignableChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleBuyerAssignableChangedMessagePayloadBuilder builder) {
         AssociateRoleBuyerAssignableChangedMessagePayload associateRoleBuyerAssignableChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(associateRoleBuyerAssignableChangedMessagePayload)
                 .isInstanceOf(AssociateRoleBuyerAssignableChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { AssociateRoleBuyerAssignableChangedMessagePayload.builder().buyerAssignable(true) } };
+        return new Object[][] { new Object[] { "buyerAssignable",
+                AssociateRoleBuyerAssignableChangedMessagePayload.builder().buyerAssignable(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleBuyerAssignableChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleBuyerAssignableChangedMessageTest.java
index 8a419b38d10..d99272f4d05 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleBuyerAssignableChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleBuyerAssignableChangedMessageTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleBuyerAssignableChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleBuyerAssignableChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleBuyerAssignableChangedMessageBuilder builder) {
         AssociateRoleBuyerAssignableChangedMessage associateRoleBuyerAssignableChangedMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(associateRoleBuyerAssignableChangedMessage)
                 .isInstanceOf(AssociateRoleBuyerAssignableChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { AssociateRoleBuyerAssignableChangedMessage.builder().buyerAssignable(true) } };
+        return new Object[][] { new Object[] { "buyerAssignable",
+                AssociateRoleBuyerAssignableChangedMessage.builder().buyerAssignable(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleCreatedMessagePayloadTest.java
index 8b00fcd85c2..d9c72cfb39e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleCreatedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleCreatedMessagePayloadBuilder builder) {
         AssociateRoleCreatedMessagePayload associateRoleCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(associateRoleCreatedMessagePayload)
                 .isInstanceOf(AssociateRoleCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "associateRole", AssociateRoleCreatedMessagePayload.builder()
                 .associateRole(new com.commercetools.api.models.associate_role.AssociateRoleImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleCreatedMessageTest.java
index 8acbe7ddd08..7a6e8a35e57 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleCreatedMessageBuilder builder) {
         AssociateRoleCreatedMessage associateRoleCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(associateRoleCreatedMessage).isInstanceOf(AssociateRoleCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleCreatedMessage.builder()
+        return new Object[][] { new Object[] { "associateRole", AssociateRoleCreatedMessage.builder()
                 .associateRole(new com.commercetools.api.models.associate_role.AssociateRoleImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleDeletedMessagePayloadTest.java
index 1afd2a652c9..b21ecaa2210 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleDeletedMessagePayloadTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleDeletedMessagePayloadTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleDeletedMessageTest.java
index 2f6a6555a9b..4efb2cea9f7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleDeletedMessageTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleDeletedMessageTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleNameSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleNameSetMessagePayloadTest.java
index 1710e78cea4..a53f6f74db9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleNameSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleNameSetMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleNameSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleNameSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleNameSetMessagePayloadBuilder builder) {
         AssociateRoleNameSetMessagePayload associateRoleNameSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(associateRoleNameSetMessagePayload)
                 .isInstanceOf(AssociateRoleNameSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleNameSetMessagePayload.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", AssociateRoleNameSetMessagePayload.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleNameSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleNameSetMessageTest.java
index c2c1c165cc8..b915e63af40 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleNameSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRoleNameSetMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleNameSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleNameSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleNameSetMessageBuilder builder) {
         AssociateRoleNameSetMessage associateRoleNameSetMessage = builder.buildUnchecked();
         Assertions.assertThat(associateRoleNameSetMessage).isInstanceOf(AssociateRoleNameSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleNameSetMessage.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", AssociateRoleNameSetMessage.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionAddedMessagePayloadTest.java
index 0c32969bfc7..3d1c38c9437 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionAddedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRolePermissionAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRolePermissionAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRolePermissionAddedMessagePayloadBuilder builder) {
         AssociateRolePermissionAddedMessagePayload associateRolePermissionAddedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(associateRolePermissionAddedMessagePayload)
                 .isInstanceOf(AssociateRolePermissionAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRolePermissionAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "permission", AssociateRolePermissionAddedMessagePayload.builder()
                 .permission(com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionAddedMessageTest.java
index 438c8f10854..094fd5894b0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionAddedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRolePermissionAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRolePermissionAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRolePermissionAddedMessageBuilder builder) {
         AssociateRolePermissionAddedMessage associateRolePermissionAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(associateRolePermissionAddedMessage)
                 .isInstanceOf(AssociateRolePermissionAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRolePermissionAddedMessage.builder()
+        return new Object[][] { new Object[] { "permission", AssociateRolePermissionAddedMessage.builder()
                 .permission(com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionRemovedMessagePayloadTest.java
index f2ecc3835fb..0dc93990b61 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionRemovedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRolePermissionRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRolePermissionRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRolePermissionRemovedMessagePayloadBuilder builder) {
         AssociateRolePermissionRemovedMessagePayload associateRolePermissionRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(associateRolePermissionRemovedMessagePayload)
                 .isInstanceOf(AssociateRolePermissionRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRolePermissionRemovedMessagePayload.builder()
+        return new Object[][] { new Object[] { "permission", AssociateRolePermissionRemovedMessagePayload.builder()
                 .permission(com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionRemovedMessageTest.java
index ee480a1f574..3f0addd3b74 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionRemovedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRolePermissionRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRolePermissionRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRolePermissionRemovedMessageBuilder builder) {
         AssociateRolePermissionRemovedMessage associateRolePermissionRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(associateRolePermissionRemovedMessage)
                 .isInstanceOf(AssociateRolePermissionRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRolePermissionRemovedMessage.builder()
+        return new Object[][] { new Object[] { "permission", AssociateRolePermissionRemovedMessage.builder()
                 .permission(com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionsSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionsSetMessagePayloadTest.java
index 795eacb576d..18161a1e76e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionsSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionsSetMessagePayloadTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRolePermissionsSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRolePermissionsSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRolePermissionsSetMessagePayloadBuilder builder) {
         AssociateRolePermissionsSetMessagePayload associateRolePermissionsSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(associateRolePermissionsSetMessagePayload)
                 .isInstanceOf(AssociateRolePermissionsSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRolePermissionsSetMessagePayload.builder()
-                .permissions(Collections.singletonList(
-                    com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits"))) } };
+        return new Object[][] { new Object[] { "permissions",
+                AssociateRolePermissionsSetMessagePayload.builder()
+                        .permissions(Collections.singletonList(
+                            com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits"))) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionsSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionsSetMessageTest.java
index 5e7229b12d7..ab5305ceefc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionsSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/AssociateRolePermissionsSetMessageTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRolePermissionsSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRolePermissionsSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRolePermissionsSetMessageBuilder builder) {
         AssociateRolePermissionsSetMessage associateRolePermissionsSetMessage = builder.buildUnchecked();
         Assertions.assertThat(associateRolePermissionsSetMessage)
                 .isInstanceOf(AssociateRolePermissionsSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRolePermissionsSetMessage.builder()
-                .permissions(Collections.singletonList(
-                    com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits"))) } };
+        return new Object[][] { new Object[] { "permissions",
+                AssociateRolePermissionsSetMessage.builder()
+                        .permissions(Collections.singletonList(
+                            com.commercetools.api.models.associate_role.Permission.findEnum("AddChildUnits"))) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressAddedMessagePayloadTest.java
index 42e3e571775..a7ffead1c7e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressAddedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressAddedMessagePayloadBuilder builder) {
         BusinessUnitAddressAddedMessagePayload businessUnitAddressAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAddressAddedMessagePayload)
                 .isInstanceOf(BusinessUnitAddressAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddressAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitAddressAddedMessagePayload.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressAddedMessageTest.java
index 53fe79020dc..acd9c957fa4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressAddedMessageBuilder builder) {
         BusinessUnitAddressAddedMessage businessUnitAddressAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAddressAddedMessage).isInstanceOf(BusinessUnitAddressAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddressAddedMessage.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitAddressAddedMessage.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressChangedMessagePayloadTest.java
index 1323596f322..fd09e4c7d01 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressChangedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressChangedMessagePayloadBuilder builder) {
         BusinessUnitAddressChangedMessagePayload businessUnitAddressChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAddressChangedMessagePayload)
                 .isInstanceOf(BusinessUnitAddressChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddressChangedMessagePayload.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitAddressChangedMessagePayload.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressChangedMessageTest.java
index 5ff50b9721b..51d0d7b4e75 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressChangedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressChangedMessageBuilder builder) {
         BusinessUnitAddressChangedMessage businessUnitAddressChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAddressChangedMessage).isInstanceOf(BusinessUnitAddressChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddressChangedMessage.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitAddressChangedMessage.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldAddedMessagePayloadTest.java
index e8f7b328c22..af0c5e8a615 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldAddedMessagePayloadTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressCustomFieldAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressCustomFieldAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressCustomFieldAddedMessagePayloadBuilder builder) {
         BusinessUnitAddressCustomFieldAddedMessagePayload businessUnitAddressCustomFieldAddedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitAddressCustomFieldAddedMessagePayload)
                 .isInstanceOf(BusinessUnitAddressCustomFieldAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitAddressCustomFieldAddedMessagePayload.builder().name("name") },
-                new Object[] { BusinessUnitAddressCustomFieldAddedMessagePayload.builder().value("value") },
-                new Object[] { BusinessUnitAddressCustomFieldAddedMessagePayload.builder().addressId("addressId") } };
+                new Object[] { "name", BusinessUnitAddressCustomFieldAddedMessagePayload.builder().name("name") },
+                new Object[] { "value", BusinessUnitAddressCustomFieldAddedMessagePayload.builder().value("value") },
+                new Object[] { "addressId",
+                        BusinessUnitAddressCustomFieldAddedMessagePayload.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldAddedMessageTest.java
index 274b6689c19..221dd97791d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldAddedMessageTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressCustomFieldAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressCustomFieldAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressCustomFieldAddedMessageBuilder builder) {
         BusinessUnitAddressCustomFieldAddedMessage businessUnitAddressCustomFieldAddedMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitAddressCustomFieldAddedMessage)
                 .isInstanceOf(BusinessUnitAddressCustomFieldAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddressCustomFieldAddedMessage.builder().name("name") },
-                new Object[] { BusinessUnitAddressCustomFieldAddedMessage.builder().value("value") },
-                new Object[] { BusinessUnitAddressCustomFieldAddedMessage.builder().addressId("addressId") } };
+        return new Object[][] {
+                new Object[] { "name", BusinessUnitAddressCustomFieldAddedMessage.builder().name("name") },
+                new Object[] { "value", BusinessUnitAddressCustomFieldAddedMessage.builder().value("value") },
+                new Object[] { "addressId",
+                        BusinessUnitAddressCustomFieldAddedMessage.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldChangedMessagePayloadTest.java
index 76a8206d2a5..be3d9570707 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldChangedMessagePayloadTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressCustomFieldChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressCustomFieldChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressCustomFieldChangedMessagePayloadBuilder builder) {
         BusinessUnitAddressCustomFieldChangedMessagePayload businessUnitAddressCustomFieldChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitAddressCustomFieldChangedMessagePayload)
                 .isInstanceOf(BusinessUnitAddressCustomFieldChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitAddressCustomFieldChangedMessagePayload.builder().name("name") },
-                new Object[] { BusinessUnitAddressCustomFieldChangedMessagePayload.builder().value("value") },
-                new Object[] { BusinessUnitAddressCustomFieldChangedMessagePayload.builder().oldValue("oldValue") },
-                new Object[] { BusinessUnitAddressCustomFieldChangedMessagePayload.builder().addressId("addressId") } };
+                new Object[] { "name", BusinessUnitAddressCustomFieldChangedMessagePayload.builder().name("name") },
+                new Object[] { "value", BusinessUnitAddressCustomFieldChangedMessagePayload.builder().value("value") },
+                new Object[] { "oldValue",
+                        BusinessUnitAddressCustomFieldChangedMessagePayload.builder().oldValue("oldValue") },
+                new Object[] { "addressId",
+                        BusinessUnitAddressCustomFieldChangedMessagePayload.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldChangedMessageTest.java
index 03be0ea2a13..491ecbe7d07 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldChangedMessageTest.java
@@ -1,35 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressCustomFieldChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressCustomFieldChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressCustomFieldChangedMessageBuilder builder) {
         BusinessUnitAddressCustomFieldChangedMessage businessUnitAddressCustomFieldChangedMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitAddressCustomFieldChangedMessage)
                 .isInstanceOf(BusinessUnitAddressCustomFieldChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddressCustomFieldChangedMessage.builder().name("name") },
-                new Object[] { BusinessUnitAddressCustomFieldChangedMessage.builder().value("value") },
-                new Object[] { BusinessUnitAddressCustomFieldChangedMessage.builder().oldValue("oldValue") },
-                new Object[] { BusinessUnitAddressCustomFieldChangedMessage.builder().addressId("addressId") } };
+        return new Object[][] {
+                new Object[] { "name", BusinessUnitAddressCustomFieldChangedMessage.builder().name("name") },
+                new Object[] { "value", BusinessUnitAddressCustomFieldChangedMessage.builder().value("value") },
+                new Object[] { "oldValue",
+                        BusinessUnitAddressCustomFieldChangedMessage.builder().oldValue("oldValue") },
+                new Object[] { "addressId",
+                        BusinessUnitAddressCustomFieldChangedMessage.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldRemovedMessagePayloadTest.java
index 7192a972f8f..a0e0f1c89cd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldRemovedMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressCustomFieldRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressCustomFieldRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressCustomFieldRemovedMessagePayloadBuilder builder) {
         BusinessUnitAddressCustomFieldRemovedMessagePayload businessUnitAddressCustomFieldRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitAddressCustomFieldRemovedMessagePayload)
                 .isInstanceOf(BusinessUnitAddressCustomFieldRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitAddressCustomFieldRemovedMessagePayload.builder().name("name") },
-                new Object[] { BusinessUnitAddressCustomFieldRemovedMessagePayload.builder().addressId("addressId") } };
+                new Object[] { "name", BusinessUnitAddressCustomFieldRemovedMessagePayload.builder().name("name") },
+                new Object[] { "addressId",
+                        BusinessUnitAddressCustomFieldRemovedMessagePayload.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldRemovedMessageTest.java
index e35dfa04bc4..a3e43ca7b06 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomFieldRemovedMessageTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressCustomFieldRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressCustomFieldRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressCustomFieldRemovedMessageBuilder builder) {
         BusinessUnitAddressCustomFieldRemovedMessage businessUnitAddressCustomFieldRemovedMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitAddressCustomFieldRemovedMessage)
                 .isInstanceOf(BusinessUnitAddressCustomFieldRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddressCustomFieldRemovedMessage.builder().name("name") },
-                new Object[] { BusinessUnitAddressCustomFieldRemovedMessage.builder().addressId("addressId") } };
+        return new Object[][] {
+                new Object[] { "name", BusinessUnitAddressCustomFieldRemovedMessage.builder().name("name") },
+                new Object[] { "addressId",
+                        BusinessUnitAddressCustomFieldRemovedMessage.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeRemovedMessagePayloadTest.java
index 063e582f6a1..20b3c0490ec 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeRemovedMessagePayloadTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressCustomTypeRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressCustomTypeRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressCustomTypeRemovedMessagePayloadBuilder builder) {
         BusinessUnitAddressCustomTypeRemovedMessagePayload businessUnitAddressCustomTypeRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitAddressCustomTypeRemovedMessagePayload)
                 .isInstanceOf(BusinessUnitAddressCustomTypeRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitAddressCustomTypeRemovedMessagePayload.builder().oldTypeId("oldTypeId") },
-                new Object[] { BusinessUnitAddressCustomTypeRemovedMessagePayload.builder().addressId("addressId") } };
+                new Object[] { "oldTypeId",
+                        BusinessUnitAddressCustomTypeRemovedMessagePayload.builder().oldTypeId("oldTypeId") },
+                new Object[] { "addressId",
+                        BusinessUnitAddressCustomTypeRemovedMessagePayload.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeRemovedMessageTest.java
index 62a92d03111..9b161b052db 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeRemovedMessageTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressCustomTypeRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressCustomTypeRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressCustomTypeRemovedMessageBuilder builder) {
         BusinessUnitAddressCustomTypeRemovedMessage businessUnitAddressCustomTypeRemovedMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitAddressCustomTypeRemovedMessage)
                 .isInstanceOf(BusinessUnitAddressCustomTypeRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitAddressCustomTypeRemovedMessage.builder().oldTypeId("oldTypeId") },
-                new Object[] { BusinessUnitAddressCustomTypeRemovedMessage.builder().addressId("addressId") } };
+                new Object[] { "oldTypeId",
+                        BusinessUnitAddressCustomTypeRemovedMessage.builder().oldTypeId("oldTypeId") },
+                new Object[] { "addressId",
+                        BusinessUnitAddressCustomTypeRemovedMessage.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeSetMessagePayloadTest.java
index 95d0f34b1d4..323b72ca19b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeSetMessagePayloadTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressCustomTypeSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressCustomTypeSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressCustomTypeSetMessagePayloadBuilder builder) {
         BusinessUnitAddressCustomTypeSetMessagePayload businessUnitAddressCustomTypeSetMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitAddressCustomTypeSetMessagePayload)
                 .isInstanceOf(BusinessUnitAddressCustomTypeSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitAddressCustomTypeSetMessagePayload.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { BusinessUnitAddressCustomTypeSetMessagePayload.builder().oldTypeId("oldTypeId") },
-                new Object[] { BusinessUnitAddressCustomTypeSetMessagePayload.builder().addressId("addressId") } };
+                new Object[] { "customFields",
+                        BusinessUnitAddressCustomTypeSetMessagePayload.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "oldTypeId",
+                        BusinessUnitAddressCustomTypeSetMessagePayload.builder().oldTypeId("oldTypeId") },
+                new Object[] { "addressId",
+                        BusinessUnitAddressCustomTypeSetMessagePayload.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeSetMessageTest.java
index 6b747fee93d..05fc3fae300 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressCustomTypeSetMessageTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressCustomTypeSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressCustomTypeSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressCustomTypeSetMessageBuilder builder) {
         BusinessUnitAddressCustomTypeSetMessage businessUnitAddressCustomTypeSetMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAddressCustomTypeSetMessage)
                 .isInstanceOf(BusinessUnitAddressCustomTypeSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitAddressCustomTypeSetMessage.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { BusinessUnitAddressCustomTypeSetMessage.builder().oldTypeId("oldTypeId") },
-                new Object[] { BusinessUnitAddressCustomTypeSetMessage.builder().addressId("addressId") } };
+                new Object[] { "customFields",
+                        BusinessUnitAddressCustomTypeSetMessage.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "oldTypeId", BusinessUnitAddressCustomTypeSetMessage.builder().oldTypeId("oldTypeId") },
+                new Object[] { "addressId",
+                        BusinessUnitAddressCustomTypeSetMessage.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressRemovedMessagePayloadTest.java
index 16a0ef4b8ce..4c6bf3b90be 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressRemovedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressRemovedMessagePayloadBuilder builder) {
         BusinessUnitAddressRemovedMessagePayload businessUnitAddressRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAddressRemovedMessagePayload)
                 .isInstanceOf(BusinessUnitAddressRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddressRemovedMessagePayload.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitAddressRemovedMessagePayload.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressRemovedMessageTest.java
index fcc7049fe30..22fac851d5e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAddressRemovedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAddressRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAddressRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAddressRemovedMessageBuilder builder) {
         BusinessUnitAddressRemovedMessage businessUnitAddressRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAddressRemovedMessage).isInstanceOf(BusinessUnitAddressRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAddressRemovedMessage.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitAddressRemovedMessage.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitApprovalRuleModeChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitApprovalRuleModeChangedMessagePayloadTest.java
index a593e06a294..ac0ac2fa00c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitApprovalRuleModeChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitApprovalRuleModeChangedMessagePayloadTest.java
@@ -1,36 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitApprovalRuleModeChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitApprovalRuleModeChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitApprovalRuleModeChangedMessagePayloadBuilder builder) {
         BusinessUnitApprovalRuleModeChangedMessagePayload businessUnitApprovalRuleModeChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitApprovalRuleModeChangedMessagePayload)
                 .isInstanceOf(BusinessUnitApprovalRuleModeChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitApprovalRuleModeChangedMessagePayload.builder()
+                new Object[] { "approvalRuleMode", BusinessUnitApprovalRuleModeChangedMessagePayload.builder()
                         .approvalRuleMode(com.commercetools.api.models.business_unit.BusinessUnitApprovalRuleMode
                                 .findEnum("Explicit")) },
-                new Object[] { BusinessUnitApprovalRuleModeChangedMessagePayload.builder()
+                new Object[] { "oldApprovalRuleMode", BusinessUnitApprovalRuleModeChangedMessagePayload.builder()
                         .oldApprovalRuleMode(com.commercetools.api.models.business_unit.BusinessUnitApprovalRuleMode
                                 .findEnum("Explicit")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitApprovalRuleModeChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitApprovalRuleModeChangedMessageTest.java
index 5157985b0d6..007aae5c6f6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitApprovalRuleModeChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitApprovalRuleModeChangedMessageTest.java
@@ -1,36 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitApprovalRuleModeChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitApprovalRuleModeChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitApprovalRuleModeChangedMessageBuilder builder) {
         BusinessUnitApprovalRuleModeChangedMessage businessUnitApprovalRuleModeChangedMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitApprovalRuleModeChangedMessage)
                 .isInstanceOf(BusinessUnitApprovalRuleModeChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitApprovalRuleModeChangedMessage.builder()
+                new Object[] { "approvalRuleMode", BusinessUnitApprovalRuleModeChangedMessage.builder()
                         .approvalRuleMode(com.commercetools.api.models.business_unit.BusinessUnitApprovalRuleMode
                                 .findEnum("Explicit")) },
-                new Object[] { BusinessUnitApprovalRuleModeChangedMessage.builder()
+                new Object[] { "oldApprovalRuleMode", BusinessUnitApprovalRuleModeChangedMessage.builder()
                         .oldApprovalRuleMode(com.commercetools.api.models.business_unit.BusinessUnitApprovalRuleMode
                                 .findEnum("Explicit")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateAddedMessagePayloadTest.java
index 1d6de6e05a0..1f712c18451 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateAddedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAssociateAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAssociateAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAssociateAddedMessagePayloadBuilder builder) {
         BusinessUnitAssociateAddedMessagePayload businessUnitAssociateAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAssociateAddedMessagePayload)
                 .isInstanceOf(BusinessUnitAssociateAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAssociateAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "associate", BusinessUnitAssociateAddedMessagePayload.builder()
                 .associate(new com.commercetools.api.models.business_unit.AssociateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateAddedMessageTest.java
index 06b592fefb2..57efa1459c7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAssociateAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAssociateAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAssociateAddedMessageBuilder builder) {
         BusinessUnitAssociateAddedMessage businessUnitAssociateAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAssociateAddedMessage).isInstanceOf(BusinessUnitAssociateAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAssociateAddedMessage.builder()
+        return new Object[][] { new Object[] { "associate", BusinessUnitAssociateAddedMessage.builder()
                 .associate(new com.commercetools.api.models.business_unit.AssociateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateChangedMessagePayloadTest.java
index c4de6194cd4..cf2736cf27f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateChangedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAssociateChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAssociateChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAssociateChangedMessagePayloadBuilder builder) {
         BusinessUnitAssociateChangedMessagePayload businessUnitAssociateChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitAssociateChangedMessagePayload)
                 .isInstanceOf(BusinessUnitAssociateChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAssociateChangedMessagePayload.builder()
+        return new Object[][] { new Object[] { "associate", BusinessUnitAssociateChangedMessagePayload.builder()
                 .associate(new com.commercetools.api.models.business_unit.AssociateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateChangedMessageTest.java
index b4d1aeb5fa5..e3ca484066a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateChangedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAssociateChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAssociateChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAssociateChangedMessageBuilder builder) {
         BusinessUnitAssociateChangedMessage businessUnitAssociateChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAssociateChangedMessage)
                 .isInstanceOf(BusinessUnitAssociateChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAssociateChangedMessage.builder()
+        return new Object[][] { new Object[] { "associate", BusinessUnitAssociateChangedMessage.builder()
                 .associate(new com.commercetools.api.models.business_unit.AssociateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateModeChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateModeChangedMessagePayloadTest.java
index 50fd6815169..3916f02c647 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateModeChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateModeChangedMessagePayloadTest.java
@@ -1,38 +1,32 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAssociateModeChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAssociateModeChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAssociateModeChangedMessagePayloadBuilder builder) {
         BusinessUnitAssociateModeChangedMessagePayload businessUnitAssociateModeChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitAssociateModeChangedMessagePayload)
                 .isInstanceOf(BusinessUnitAssociateModeChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitAssociateModeChangedMessagePayload.builder()
-                        .associateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
-                                .findEnum("Explicit")) },
-                new Object[] { BusinessUnitAssociateModeChangedMessagePayload.builder()
-                        .oldAssociateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
-                                .findEnum("Explicit")) } };
+                new Object[] { "associateMode",
+                        BusinessUnitAssociateModeChangedMessagePayload.builder()
+                                .associateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
+                                        .findEnum("Explicit")) },
+                new Object[] { "oldAssociateMode",
+                        BusinessUnitAssociateModeChangedMessagePayload.builder()
+                                .oldAssociateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
+                                        .findEnum("Explicit")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateModeChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateModeChangedMessageTest.java
index 2e1c3bba8ef..5ca83792649 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateModeChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateModeChangedMessageTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAssociateModeChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAssociateModeChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAssociateModeChangedMessageBuilder builder) {
         BusinessUnitAssociateModeChangedMessage businessUnitAssociateModeChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAssociateModeChangedMessage)
                 .isInstanceOf(BusinessUnitAssociateModeChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitAssociateModeChangedMessage.builder()
-                        .associateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
-                                .findEnum("Explicit")) },
-                new Object[] { BusinessUnitAssociateModeChangedMessage.builder()
-                        .oldAssociateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
-                                .findEnum("Explicit")) } };
+                new Object[] { "associateMode",
+                        BusinessUnitAssociateModeChangedMessage.builder()
+                                .associateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
+                                        .findEnum("Explicit")) },
+                new Object[] { "oldAssociateMode",
+                        BusinessUnitAssociateModeChangedMessage.builder()
+                                .oldAssociateMode(com.commercetools.api.models.business_unit.BusinessUnitAssociateMode
+                                        .findEnum("Explicit")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateRemovedMessagePayloadTest.java
index 72be14e8830..f3be2c3c882 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateRemovedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAssociateRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAssociateRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAssociateRemovedMessagePayloadBuilder builder) {
         BusinessUnitAssociateRemovedMessagePayload businessUnitAssociateRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitAssociateRemovedMessagePayload)
                 .isInstanceOf(BusinessUnitAssociateRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAssociateRemovedMessagePayload.builder()
+        return new Object[][] { new Object[] { "associate", BusinessUnitAssociateRemovedMessagePayload.builder()
                 .associate(new com.commercetools.api.models.business_unit.AssociateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateRemovedMessageTest.java
index 1473829d42f..3c7fbae5688 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociateRemovedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAssociateRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAssociateRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAssociateRemovedMessageBuilder builder) {
         BusinessUnitAssociateRemovedMessage businessUnitAssociateRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAssociateRemovedMessage)
                 .isInstanceOf(BusinessUnitAssociateRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAssociateRemovedMessage.builder()
+        return new Object[][] { new Object[] { "associate", BusinessUnitAssociateRemovedMessage.builder()
                 .associate(new com.commercetools.api.models.business_unit.AssociateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociatesSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociatesSetMessagePayloadTest.java
index 1a55de7d5ac..df49b7590a1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociatesSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociatesSetMessagePayloadTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAssociatesSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAssociatesSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAssociatesSetMessagePayloadBuilder builder) {
         BusinessUnitAssociatesSetMessagePayload businessUnitAssociatesSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAssociatesSetMessagePayload)
                 .isInstanceOf(BusinessUnitAssociatesSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAssociatesSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "associates", BusinessUnitAssociatesSetMessagePayload.builder()
                 .associates(
                     Collections.singletonList(new com.commercetools.api.models.business_unit.AssociateImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociatesSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociatesSetMessageTest.java
index e2accd916f8..47f6edb21f4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociatesSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitAssociatesSetMessageTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitAssociatesSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitAssociatesSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitAssociatesSetMessageBuilder builder) {
         BusinessUnitAssociatesSetMessage businessUnitAssociatesSetMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitAssociatesSetMessage).isInstanceOf(BusinessUnitAssociatesSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitAssociatesSetMessage.builder()
+        return new Object[][] { new Object[] { "associates", BusinessUnitAssociatesSetMessage.builder()
                 .associates(
                     Collections.singletonList(new com.commercetools.api.models.business_unit.AssociateImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressAddedMessagePayloadTest.java
index 5738c8bbbcd..d57e4640e49 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressAddedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitBillingAddressAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitBillingAddressAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitBillingAddressAddedMessagePayloadBuilder builder) {
         BusinessUnitBillingAddressAddedMessagePayload businessUnitBillingAddressAddedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitBillingAddressAddedMessagePayload)
                 .isInstanceOf(BusinessUnitBillingAddressAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitBillingAddressAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitBillingAddressAddedMessagePayload.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressAddedMessageTest.java
index f52f829aa76..0a8f0685663 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressAddedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitBillingAddressAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitBillingAddressAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitBillingAddressAddedMessageBuilder builder) {
         BusinessUnitBillingAddressAddedMessage businessUnitBillingAddressAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitBillingAddressAddedMessage)
                 .isInstanceOf(BusinessUnitBillingAddressAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitBillingAddressAddedMessage.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitBillingAddressAddedMessage.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressRemovedMessagePayloadTest.java
index 2619b23b579..cbbbf31cdf7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressRemovedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitBillingAddressRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitBillingAddressRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitBillingAddressRemovedMessagePayloadBuilder builder) {
         BusinessUnitBillingAddressRemovedMessagePayload businessUnitBillingAddressRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitBillingAddressRemovedMessagePayload)
                 .isInstanceOf(BusinessUnitBillingAddressRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitBillingAddressRemovedMessagePayload.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitBillingAddressRemovedMessagePayload.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressRemovedMessageTest.java
index 1b5028cbd18..398100528cd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitBillingAddressRemovedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitBillingAddressRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitBillingAddressRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitBillingAddressRemovedMessageBuilder builder) {
         BusinessUnitBillingAddressRemovedMessage businessUnitBillingAddressRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitBillingAddressRemovedMessage)
                 .isInstanceOf(BusinessUnitBillingAddressRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitBillingAddressRemovedMessage.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitBillingAddressRemovedMessage.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitContactEmailSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitContactEmailSetMessagePayloadTest.java
index cffa0b4541d..3de5d7c0361 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitContactEmailSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitContactEmailSetMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitContactEmailSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitContactEmailSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitContactEmailSetMessagePayloadBuilder builder) {
         BusinessUnitContactEmailSetMessagePayload businessUnitContactEmailSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitContactEmailSetMessagePayload)
                 .isInstanceOf(BusinessUnitContactEmailSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { BusinessUnitContactEmailSetMessagePayload.builder().contactEmail("contactEmail") } };
+        return new Object[][] { new Object[] { "contactEmail",
+                BusinessUnitContactEmailSetMessagePayload.builder().contactEmail("contactEmail") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitContactEmailSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitContactEmailSetMessageTest.java
index 34030416f94..9cdf9da5733 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitContactEmailSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitContactEmailSetMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitContactEmailSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitContactEmailSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitContactEmailSetMessageBuilder builder) {
         BusinessUnitContactEmailSetMessage businessUnitContactEmailSetMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitContactEmailSetMessage)
                 .isInstanceOf(BusinessUnitContactEmailSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { BusinessUnitContactEmailSetMessage.builder().contactEmail("contactEmail") } };
+        return new Object[][] { new Object[] { "contactEmail",
+                BusinessUnitContactEmailSetMessage.builder().contactEmail("contactEmail") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCreatedMessagePayloadTest.java
index 41ecaaf9635..88236839e96 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitCreatedMessagePayloadBuilder builder) {
         BusinessUnitCreatedMessagePayload businessUnitCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitCreatedMessagePayload).isInstanceOf(BusinessUnitCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "businessUnit", BusinessUnitCreatedMessagePayload.builder()
                 .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCreatedMessageTest.java
index 2a0f54f5c64..1c68055205b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitCreatedMessageBuilder builder) {
         BusinessUnitCreatedMessage businessUnitCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitCreatedMessage).isInstanceOf(BusinessUnitCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitCreatedMessage.builder()
+        return new Object[][] { new Object[] { "businessUnit", BusinessUnitCreatedMessage.builder()
                 .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldAddedMessagePayloadTest.java
index fcdffc53674..e5fa0684b3a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldAddedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitCustomFieldAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitCustomFieldAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitCustomFieldAddedMessagePayloadBuilder builder) {
         BusinessUnitCustomFieldAddedMessagePayload businessUnitCustomFieldAddedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitCustomFieldAddedMessagePayload)
                 .isInstanceOf(BusinessUnitCustomFieldAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitCustomFieldAddedMessagePayload.builder().name("name") },
-                new Object[] { BusinessUnitCustomFieldAddedMessagePayload.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "name", BusinessUnitCustomFieldAddedMessagePayload.builder().name("name") },
+                new Object[] { "value", BusinessUnitCustomFieldAddedMessagePayload.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldAddedMessageTest.java
index 6b7dc6a1e87..ca85e98f766 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldAddedMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitCustomFieldAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitCustomFieldAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitCustomFieldAddedMessageBuilder builder) {
         BusinessUnitCustomFieldAddedMessage businessUnitCustomFieldAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitCustomFieldAddedMessage)
                 .isInstanceOf(BusinessUnitCustomFieldAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitCustomFieldAddedMessage.builder().name("name") },
-                new Object[] { BusinessUnitCustomFieldAddedMessage.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", BusinessUnitCustomFieldAddedMessage.builder().name("name") },
+                new Object[] { "value", BusinessUnitCustomFieldAddedMessage.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldChangedMessagePayloadTest.java
index e09587517ed..53dd8b407ac 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldChangedMessagePayloadTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitCustomFieldChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitCustomFieldChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitCustomFieldChangedMessagePayloadBuilder builder) {
         BusinessUnitCustomFieldChangedMessagePayload businessUnitCustomFieldChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitCustomFieldChangedMessagePayload)
                 .isInstanceOf(BusinessUnitCustomFieldChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitCustomFieldChangedMessagePayload.builder().name("name") },
-                new Object[] { BusinessUnitCustomFieldChangedMessagePayload.builder().value("value") },
-                new Object[] { BusinessUnitCustomFieldChangedMessagePayload.builder().oldValue("oldValue") } };
+        return new Object[][] {
+                new Object[] { "name", BusinessUnitCustomFieldChangedMessagePayload.builder().name("name") },
+                new Object[] { "value", BusinessUnitCustomFieldChangedMessagePayload.builder().value("value") },
+                new Object[] { "oldValue",
+                        BusinessUnitCustomFieldChangedMessagePayload.builder().oldValue("oldValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldChangedMessageTest.java
index af561b55c10..62fd803822f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldChangedMessageTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitCustomFieldChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitCustomFieldChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitCustomFieldChangedMessageBuilder builder) {
         BusinessUnitCustomFieldChangedMessage businessUnitCustomFieldChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitCustomFieldChangedMessage)
                 .isInstanceOf(BusinessUnitCustomFieldChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitCustomFieldChangedMessage.builder().name("name") },
-                new Object[] { BusinessUnitCustomFieldChangedMessage.builder().value("value") },
-                new Object[] { BusinessUnitCustomFieldChangedMessage.builder().oldValue("oldValue") } };
+        return new Object[][] { new Object[] { "name", BusinessUnitCustomFieldChangedMessage.builder().name("name") },
+                new Object[] { "value", BusinessUnitCustomFieldChangedMessage.builder().value("value") },
+                new Object[] { "oldValue", BusinessUnitCustomFieldChangedMessage.builder().oldValue("oldValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldRemovedMessagePayloadTest.java
index effb2765546..8d34dd0226e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldRemovedMessagePayloadTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitCustomFieldRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitCustomFieldRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitCustomFieldRemovedMessagePayloadBuilder builder) {
         BusinessUnitCustomFieldRemovedMessagePayload businessUnitCustomFieldRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitCustomFieldRemovedMessagePayload)
                 .isInstanceOf(BusinessUnitCustomFieldRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitCustomFieldRemovedMessagePayload.builder().name("name") } };
+        return new Object[][] {
+                new Object[] { "name", BusinessUnitCustomFieldRemovedMessagePayload.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldRemovedMessageTest.java
index 662dd66bb59..41fafb9ac48 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomFieldRemovedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitCustomFieldRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitCustomFieldRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitCustomFieldRemovedMessageBuilder builder) {
         BusinessUnitCustomFieldRemovedMessage businessUnitCustomFieldRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitCustomFieldRemovedMessage)
                 .isInstanceOf(BusinessUnitCustomFieldRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitCustomFieldRemovedMessage.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", BusinessUnitCustomFieldRemovedMessage.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeRemovedMessagePayloadTest.java
index 1d5ea15046d..372265fb1ba 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeRemovedMessagePayloadTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitCustomTypeRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitCustomTypeRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitCustomTypeRemovedMessagePayloadBuilder builder) {
         BusinessUnitCustomTypeRemovedMessagePayload businessUnitCustomTypeRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitCustomTypeRemovedMessagePayload)
                 .isInstanceOf(BusinessUnitCustomTypeRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { BusinessUnitCustomTypeRemovedMessagePayload.builder().oldTypeId("oldTypeId") } };
+        return new Object[][] { new Object[] { "oldTypeId",
+                BusinessUnitCustomTypeRemovedMessagePayload.builder().oldTypeId("oldTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeRemovedMessageTest.java
index 1b3a8276456..a189ac37a34 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeRemovedMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitCustomTypeRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitCustomTypeRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitCustomTypeRemovedMessageBuilder builder) {
         BusinessUnitCustomTypeRemovedMessage businessUnitCustomTypeRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitCustomTypeRemovedMessage)
                 .isInstanceOf(BusinessUnitCustomTypeRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitCustomTypeRemovedMessage.builder().oldTypeId("oldTypeId") } };
+                new Object[] { "oldTypeId", BusinessUnitCustomTypeRemovedMessage.builder().oldTypeId("oldTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeSetMessagePayloadTest.java
index bf693c82600..af5d57f2aae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeSetMessagePayloadTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitCustomTypeSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitCustomTypeSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitCustomTypeSetMessagePayloadBuilder builder) {
         BusinessUnitCustomTypeSetMessagePayload businessUnitCustomTypeSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitCustomTypeSetMessagePayload)
                 .isInstanceOf(BusinessUnitCustomTypeSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitCustomTypeSetMessagePayload.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { BusinessUnitCustomTypeSetMessagePayload.builder().oldTypeId("oldTypeId") } };
+                new Object[] { "customFields",
+                        BusinessUnitCustomTypeSetMessagePayload.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "oldTypeId",
+                        BusinessUnitCustomTypeSetMessagePayload.builder().oldTypeId("oldTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeSetMessageTest.java
index c68a5bcec56..f863554bec1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitCustomTypeSetMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitCustomTypeSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitCustomTypeSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitCustomTypeSetMessageBuilder builder) {
         BusinessUnitCustomTypeSetMessage businessUnitCustomTypeSetMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitCustomTypeSetMessage).isInstanceOf(BusinessUnitCustomTypeSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitCustomTypeSetMessage.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { BusinessUnitCustomTypeSetMessage.builder().oldTypeId("oldTypeId") } };
+                new Object[] { "customFields",
+                        BusinessUnitCustomTypeSetMessage.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "oldTypeId", BusinessUnitCustomTypeSetMessage.builder().oldTypeId("oldTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultBillingAddressSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultBillingAddressSetMessagePayloadTest.java
index 650b677390e..14c2861e72a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultBillingAddressSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultBillingAddressSetMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitDefaultBillingAddressSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitDefaultBillingAddressSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitDefaultBillingAddressSetMessagePayloadBuilder builder) {
         BusinessUnitDefaultBillingAddressSetMessagePayload businessUnitDefaultBillingAddressSetMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitDefaultBillingAddressSetMessagePayload)
                 .isInstanceOf(BusinessUnitDefaultBillingAddressSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitDefaultBillingAddressSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitDefaultBillingAddressSetMessagePayload.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultBillingAddressSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultBillingAddressSetMessageTest.java
index 95dff5fd251..07b8fd2ef26 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultBillingAddressSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultBillingAddressSetMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitDefaultBillingAddressSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitDefaultBillingAddressSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitDefaultBillingAddressSetMessageBuilder builder) {
         BusinessUnitDefaultBillingAddressSetMessage businessUnitDefaultBillingAddressSetMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitDefaultBillingAddressSetMessage)
                 .isInstanceOf(BusinessUnitDefaultBillingAddressSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitDefaultBillingAddressSetMessage.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitDefaultBillingAddressSetMessage.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultShippingAddressSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultShippingAddressSetMessagePayloadTest.java
index b7ec4549fb7..20355f73962 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultShippingAddressSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultShippingAddressSetMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitDefaultShippingAddressSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitDefaultShippingAddressSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitDefaultShippingAddressSetMessagePayloadBuilder builder) {
         BusinessUnitDefaultShippingAddressSetMessagePayload businessUnitDefaultShippingAddressSetMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitDefaultShippingAddressSetMessagePayload)
                 .isInstanceOf(BusinessUnitDefaultShippingAddressSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitDefaultShippingAddressSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitDefaultShippingAddressSetMessagePayload.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultShippingAddressSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultShippingAddressSetMessageTest.java
index a813554be5a..27a7a7e9936 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultShippingAddressSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDefaultShippingAddressSetMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitDefaultShippingAddressSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitDefaultShippingAddressSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitDefaultShippingAddressSetMessageBuilder builder) {
         BusinessUnitDefaultShippingAddressSetMessage businessUnitDefaultShippingAddressSetMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitDefaultShippingAddressSetMessage)
                 .isInstanceOf(BusinessUnitDefaultShippingAddressSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitDefaultShippingAddressSetMessage.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitDefaultShippingAddressSetMessage.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDeletedMessagePayloadTest.java
index 463a11d645f..9596d8c4b0f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDeletedMessagePayloadTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitDeletedMessagePayloadTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDeletedMessageTest.java
index 03c30399430..34f380689a1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitDeletedMessageTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitDeletedMessageTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitNameChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitNameChangedMessagePayloadTest.java
index 97c5cf14c31..d2a4f15ac11 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitNameChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitNameChangedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitNameChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitNameChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitNameChangedMessagePayloadBuilder builder) {
         BusinessUnitNameChangedMessagePayload businessUnitNameChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitNameChangedMessagePayload)
                 .isInstanceOf(BusinessUnitNameChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitNameChangedMessagePayload.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", BusinessUnitNameChangedMessagePayload.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitNameChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitNameChangedMessageTest.java
index 39ec5f424ca..2c39b146b67 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitNameChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitNameChangedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitNameChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitNameChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitNameChangedMessageBuilder builder) {
         BusinessUnitNameChangedMessage businessUnitNameChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitNameChangedMessage).isInstanceOf(BusinessUnitNameChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitNameChangedMessage.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", BusinessUnitNameChangedMessage.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitParentChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitParentChangedMessagePayloadTest.java
index a4493ae9092..9e1a9d84ea6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitParentChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitParentChangedMessagePayloadTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitParentChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitParentChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitParentChangedMessagePayloadBuilder builder) {
         BusinessUnitParentChangedMessagePayload businessUnitParentChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitParentChangedMessagePayload)
                 .isInstanceOf(BusinessUnitParentChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitParentChangedMessagePayload.builder()
+                new Object[] { "oldParentUnit", BusinessUnitParentChangedMessagePayload.builder()
                         .oldParentUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { BusinessUnitParentChangedMessagePayload.builder()
-                        .newParentUnit(
-                            new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
+                new Object[] { "newParentUnit",
+                        BusinessUnitParentChangedMessagePayload.builder()
+                                .newParentUnit(
+                                    new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitParentChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitParentChangedMessageTest.java
index fa2ee8994c3..98eba279a32 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitParentChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitParentChangedMessageTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitParentChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitParentChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitParentChangedMessageBuilder builder) {
         BusinessUnitParentChangedMessage businessUnitParentChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitParentChangedMessage).isInstanceOf(BusinessUnitParentChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitParentChangedMessage.builder()
+                new Object[] { "oldParentUnit", BusinessUnitParentChangedMessage.builder()
                         .oldParentUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { BusinessUnitParentChangedMessage.builder()
-                        .newParentUnit(
-                            new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
+                new Object[] { "newParentUnit",
+                        BusinessUnitParentChangedMessage.builder()
+                                .newParentUnit(
+                                    new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressAddedMessagePayloadTest.java
index b8b84f3a977..6968fbe8361 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressAddedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitShippingAddressAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitShippingAddressAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitShippingAddressAddedMessagePayloadBuilder builder) {
         BusinessUnitShippingAddressAddedMessagePayload businessUnitShippingAddressAddedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitShippingAddressAddedMessagePayload)
                 .isInstanceOf(BusinessUnitShippingAddressAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitShippingAddressAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitShippingAddressAddedMessagePayload.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressAddedMessageTest.java
index c6bdc6df011..b116ffc2640 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressAddedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitShippingAddressAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitShippingAddressAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitShippingAddressAddedMessageBuilder builder) {
         BusinessUnitShippingAddressAddedMessage businessUnitShippingAddressAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitShippingAddressAddedMessage)
                 .isInstanceOf(BusinessUnitShippingAddressAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitShippingAddressAddedMessage.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitShippingAddressAddedMessage.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressRemovedMessagePayloadTest.java
index 81d1ce88ac1..bd97f677a96 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressRemovedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitShippingAddressRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitShippingAddressRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitShippingAddressRemovedMessagePayloadBuilder builder) {
         BusinessUnitShippingAddressRemovedMessagePayload businessUnitShippingAddressRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitShippingAddressRemovedMessagePayload)
                 .isInstanceOf(BusinessUnitShippingAddressRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitShippingAddressRemovedMessagePayload.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitShippingAddressRemovedMessagePayload.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressRemovedMessageTest.java
index 3570228ec0c..ed312735027 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitShippingAddressRemovedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitShippingAddressRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitShippingAddressRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitShippingAddressRemovedMessageBuilder builder) {
         BusinessUnitShippingAddressRemovedMessage businessUnitShippingAddressRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitShippingAddressRemovedMessage)
                 .isInstanceOf(BusinessUnitShippingAddressRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitShippingAddressRemovedMessage.builder()
+        return new Object[][] { new Object[] { "address", BusinessUnitShippingAddressRemovedMessage.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStatusChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStatusChangedMessagePayloadTest.java
index 3d071e6e61c..e5789ac2ed3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStatusChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStatusChangedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitStatusChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitStatusChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitStatusChangedMessagePayloadBuilder builder) {
         BusinessUnitStatusChangedMessagePayload businessUnitStatusChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitStatusChangedMessagePayload)
                 .isInstanceOf(BusinessUnitStatusChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitStatusChangedMessagePayload.builder()
+        return new Object[][] { new Object[] { "active", BusinessUnitStatusChangedMessagePayload.builder()
                 .active(com.commercetools.api.models.business_unit.BusinessUnitStatus.findEnum("Active")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStatusChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStatusChangedMessageTest.java
index 1dee06cb4ab..e19bd7b6d88 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStatusChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStatusChangedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitStatusChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitStatusChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitStatusChangedMessageBuilder builder) {
         BusinessUnitStatusChangedMessage businessUnitStatusChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitStatusChangedMessage).isInstanceOf(BusinessUnitStatusChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitStatusChangedMessage.builder()
+        return new Object[][] { new Object[] { "active", BusinessUnitStatusChangedMessage.builder()
                 .active(com.commercetools.api.models.business_unit.BusinessUnitStatus.findEnum("Active")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreAddedMessagePayloadTest.java
index a0f33bd594a..fecb9accb9b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreAddedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitStoreAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitStoreAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitStoreAddedMessagePayloadBuilder builder) {
         BusinessUnitStoreAddedMessagePayload businessUnitStoreAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitStoreAddedMessagePayload)
                 .isInstanceOf(BusinessUnitStoreAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitStoreAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "store", BusinessUnitStoreAddedMessagePayload.builder()
                 .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreAddedMessageTest.java
index 863c37d99ce..7e5563a68b9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitStoreAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitStoreAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitStoreAddedMessageBuilder builder) {
         BusinessUnitStoreAddedMessage businessUnitStoreAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitStoreAddedMessage).isInstanceOf(BusinessUnitStoreAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitStoreAddedMessage.builder()
+        return new Object[][] { new Object[] { "store", BusinessUnitStoreAddedMessage.builder()
                 .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreModeChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreModeChangedMessagePayloadTest.java
index fb1ebacbe2b..26ea4e8bfd3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreModeChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreModeChangedMessagePayloadTest.java
@@ -3,43 +3,37 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitStoreModeChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitStoreModeChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitStoreModeChangedMessagePayloadBuilder builder) {
         BusinessUnitStoreModeChangedMessagePayload businessUnitStoreModeChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(businessUnitStoreModeChangedMessagePayload)
                 .isInstanceOf(BusinessUnitStoreModeChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitStoreModeChangedMessagePayload.builder()
-                        .stores(Collections
-                                .singletonList(new com.commercetools.api.models.store.StoreKeyReferenceImpl())) },
-                new Object[] {
+                new Object[] { "stores",
+                        BusinessUnitStoreModeChangedMessagePayload.builder()
+                                .stores(Collections.singletonList(
+                                    new com.commercetools.api.models.store.StoreKeyReferenceImpl())) },
+                new Object[] { "storeMode",
                         BusinessUnitStoreModeChangedMessagePayload.builder()
                                 .storeMode(com.commercetools.api.models.business_unit.BusinessUnitStoreMode
                                         .findEnum("Explicit")) },
-                new Object[] { BusinessUnitStoreModeChangedMessagePayload.builder()
-                        .oldStores(Collections
-                                .singletonList(new com.commercetools.api.models.store.StoreKeyReferenceImpl())) },
-                new Object[] { BusinessUnitStoreModeChangedMessagePayload.builder()
+                new Object[] { "oldStores",
+                        BusinessUnitStoreModeChangedMessagePayload.builder()
+                                .oldStores(Collections.singletonList(
+                                    new com.commercetools.api.models.store.StoreKeyReferenceImpl())) },
+                new Object[] { "oldStoreMode", BusinessUnitStoreModeChangedMessagePayload.builder()
                         .oldStoreMode(
                             com.commercetools.api.models.business_unit.BusinessUnitStoreMode.findEnum("Explicit")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreModeChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreModeChangedMessageTest.java
index ed989fe7956..53ef8d5eb76 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreModeChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreModeChangedMessageTest.java
@@ -3,42 +3,36 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitStoreModeChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitStoreModeChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitStoreModeChangedMessageBuilder builder) {
         BusinessUnitStoreModeChangedMessage businessUnitStoreModeChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitStoreModeChangedMessage)
                 .isInstanceOf(BusinessUnitStoreModeChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitStoreModeChangedMessage.builder()
-                        .stores(Collections
-                                .singletonList(new com.commercetools.api.models.store.StoreKeyReferenceImpl())) },
-                new Object[] {
+                new Object[] { "stores",
+                        BusinessUnitStoreModeChangedMessage.builder()
+                                .stores(Collections.singletonList(
+                                    new com.commercetools.api.models.store.StoreKeyReferenceImpl())) },
+                new Object[] { "storeMode",
                         BusinessUnitStoreModeChangedMessage.builder()
                                 .storeMode(com.commercetools.api.models.business_unit.BusinessUnitStoreMode
                                         .findEnum("Explicit")) },
-                new Object[] { BusinessUnitStoreModeChangedMessage.builder()
-                        .oldStores(Collections
-                                .singletonList(new com.commercetools.api.models.store.StoreKeyReferenceImpl())) },
-                new Object[] { BusinessUnitStoreModeChangedMessage.builder()
+                new Object[] { "oldStores",
+                        BusinessUnitStoreModeChangedMessage.builder()
+                                .oldStores(Collections.singletonList(
+                                    new com.commercetools.api.models.store.StoreKeyReferenceImpl())) },
+                new Object[] { "oldStoreMode", BusinessUnitStoreModeChangedMessage.builder()
                         .oldStoreMode(
                             com.commercetools.api.models.business_unit.BusinessUnitStoreMode.findEnum("Explicit")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreRemovedMessagePayloadTest.java
index 484e3e20ea5..35f7d5052c2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreRemovedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitStoreRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitStoreRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitStoreRemovedMessagePayloadBuilder builder) {
         BusinessUnitStoreRemovedMessagePayload businessUnitStoreRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitStoreRemovedMessagePayload)
                 .isInstanceOf(BusinessUnitStoreRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitStoreRemovedMessagePayload.builder()
+        return new Object[][] { new Object[] { "store", BusinessUnitStoreRemovedMessagePayload.builder()
                 .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreRemovedMessageTest.java
index 50d5a251c83..ce3b2a0c231 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoreRemovedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitStoreRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitStoreRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitStoreRemovedMessageBuilder builder) {
         BusinessUnitStoreRemovedMessage businessUnitStoreRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitStoreRemovedMessage).isInstanceOf(BusinessUnitStoreRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitStoreRemovedMessage.builder()
+        return new Object[][] { new Object[] { "store", BusinessUnitStoreRemovedMessage.builder()
                 .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoresSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoresSetMessagePayloadTest.java
index d82cbf3514e..6db302bd8a5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoresSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoresSetMessagePayloadTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitStoresSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitStoresSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitStoresSetMessagePayloadBuilder builder) {
         BusinessUnitStoresSetMessagePayload businessUnitStoresSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitStoresSetMessagePayload)
                 .isInstanceOf(BusinessUnitStoresSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitStoresSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "stores", BusinessUnitStoresSetMessagePayload.builder()
                 .stores(Collections.singletonList(new com.commercetools.api.models.store.StoreKeyReferenceImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoresSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoresSetMessageTest.java
index 1916486a31d..0ce715037e4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoresSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitStoresSetMessageTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitStoresSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitStoresSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitStoresSetMessageBuilder builder) {
         BusinessUnitStoresSetMessage businessUnitStoresSetMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitStoresSetMessage).isInstanceOf(BusinessUnitStoresSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitStoresSetMessage.builder()
+        return new Object[][] { new Object[] { "stores", BusinessUnitStoresSetMessage.builder()
                 .stores(Collections.singletonList(new com.commercetools.api.models.store.StoreKeyReferenceImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTopLevelUnitSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTopLevelUnitSetMessagePayloadTest.java
index 880f99ac177..ba6dee4b5ab 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTopLevelUnitSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTopLevelUnitSetMessagePayloadTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitTopLevelUnitSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitTopLevelUnitSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitTopLevelUnitSetMessagePayloadBuilder builder) {
         BusinessUnitTopLevelUnitSetMessagePayload businessUnitTopLevelUnitSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitTopLevelUnitSetMessagePayload)
                 .isInstanceOf(BusinessUnitTopLevelUnitSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitTopLevelUnitSetMessagePayload.builder()
+                new Object[] { "topLevelUnit", BusinessUnitTopLevelUnitSetMessagePayload.builder()
                         .topLevelUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { BusinessUnitTopLevelUnitSetMessagePayload.builder()
-                        .oldTopLevelUnit(
-                            new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
+                new Object[] { "oldTopLevelUnit",
+                        BusinessUnitTopLevelUnitSetMessagePayload.builder()
+                                .oldTopLevelUnit(
+                                    new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTopLevelUnitSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTopLevelUnitSetMessageTest.java
index 3ec73543665..7f957f51d5c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTopLevelUnitSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTopLevelUnitSetMessageTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitTopLevelUnitSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitTopLevelUnitSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitTopLevelUnitSetMessageBuilder builder) {
         BusinessUnitTopLevelUnitSetMessage businessUnitTopLevelUnitSetMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitTopLevelUnitSetMessage)
                 .isInstanceOf(BusinessUnitTopLevelUnitSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitTopLevelUnitSetMessage.builder()
+                new Object[] { "topLevelUnit", BusinessUnitTopLevelUnitSetMessage.builder()
                         .topLevelUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { BusinessUnitTopLevelUnitSetMessage.builder()
-                        .oldTopLevelUnit(
-                            new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
+                new Object[] { "oldTopLevelUnit",
+                        BusinessUnitTopLevelUnitSetMessage.builder()
+                                .oldTopLevelUnit(
+                                    new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTypeSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTypeSetMessagePayloadTest.java
index cd4be7d7bcc..5dfe779d76c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTypeSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTypeSetMessagePayloadTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitTypeSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitTypeSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitTypeSetMessagePayloadBuilder builder) {
         BusinessUnitTypeSetMessagePayload businessUnitTypeSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(businessUnitTypeSetMessagePayload).isInstanceOf(BusinessUnitTypeSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitTypeSetMessagePayload.builder()
+                new Object[] { "parentUnit", BusinessUnitTypeSetMessagePayload.builder()
                         .parentUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { BusinessUnitTypeSetMessagePayload.builder()
+                new Object[] { "oldParentUnit", BusinessUnitTypeSetMessagePayload.builder()
                         .oldParentUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { BusinessUnitTypeSetMessagePayload.builder()
+                new Object[] { "unitType", BusinessUnitTypeSetMessagePayload.builder()
                         .unitType(com.commercetools.api.models.business_unit.BusinessUnitType.findEnum("Company")) },
-                new Object[] { BusinessUnitTypeSetMessagePayload.builder()
+                new Object[] { "oldUnitType", BusinessUnitTypeSetMessagePayload.builder()
                         .oldUnitType(
                             com.commercetools.api.models.business_unit.BusinessUnitType.findEnum("Company")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTypeSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTypeSetMessageTest.java
index 85958996c64..0011ac2c1db 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTypeSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/BusinessUnitTypeSetMessageTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitTypeSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitTypeSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitTypeSetMessageBuilder builder) {
         BusinessUnitTypeSetMessage businessUnitTypeSetMessage = builder.buildUnchecked();
         Assertions.assertThat(businessUnitTypeSetMessage).isInstanceOf(BusinessUnitTypeSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitTypeSetMessage.builder()
+                new Object[] { "parentUnit", BusinessUnitTypeSetMessage.builder()
                         .parentUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { BusinessUnitTypeSetMessage.builder()
+                new Object[] { "oldParentUnit", BusinessUnitTypeSetMessage.builder()
                         .oldParentUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { BusinessUnitTypeSetMessage.builder()
+                new Object[] { "unitType", BusinessUnitTypeSetMessage.builder()
                         .unitType(com.commercetools.api.models.business_unit.BusinessUnitType.findEnum("Company")) },
-                new Object[] { BusinessUnitTypeSetMessage.builder()
+                new Object[] { "oldUnitType", BusinessUnitTypeSetMessage.builder()
                         .oldUnitType(
                             com.commercetools.api.models.business_unit.BusinessUnitType.findEnum("Company")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountCreatedMessagePayloadTest.java
index ff2457252a5..893ed6e785b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountCreatedMessagePayloadBuilder builder) {
         CartDiscountCreatedMessagePayload cartDiscountCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountCreatedMessagePayload).isInstanceOf(CartDiscountCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "cartDiscount", CartDiscountCreatedMessagePayload.builder()
                 .cartDiscount(new com.commercetools.api.models.cart_discount.CartDiscountImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountCreatedMessageTest.java
index e4d19ef5b00..79a788d7a88 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountCreatedMessageBuilder builder) {
         CartDiscountCreatedMessage cartDiscountCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountCreatedMessage).isInstanceOf(CartDiscountCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountCreatedMessage.builder()
+        return new Object[][] { new Object[] { "cartDiscount", CartDiscountCreatedMessage.builder()
                 .cartDiscount(new com.commercetools.api.models.cart_discount.CartDiscountImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountDeletedMessagePayloadTest.java
index 6b4ca868c6e..d25a6ec5dca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountDeletedMessagePayloadTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountDeletedMessagePayloadTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountDeletedMessageTest.java
index 4802c1dc28d..1ca4a30ef50 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountDeletedMessageTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountDeletedMessageTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreAddedMessagePayloadTest.java
index 98ff07df391..4465fa2a8ae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreAddedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountStoreAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountStoreAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountStoreAddedMessagePayloadBuilder builder) {
         CartDiscountStoreAddedMessagePayload cartDiscountStoreAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountStoreAddedMessagePayload)
                 .isInstanceOf(CartDiscountStoreAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountStoreAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "store", CartDiscountStoreAddedMessagePayload.builder()
                 .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreAddedMessageTest.java
index 3fb812eb5ba..0b9a65e4932 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountStoreAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountStoreAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountStoreAddedMessageBuilder builder) {
         CartDiscountStoreAddedMessage cartDiscountStoreAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountStoreAddedMessage).isInstanceOf(CartDiscountStoreAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountStoreAddedMessage.builder()
+        return new Object[][] { new Object[] { "store", CartDiscountStoreAddedMessage.builder()
                 .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreRemovedMessagePayloadTest.java
index 6deb5bddcab..b35ca04949b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreRemovedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountStoreRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountStoreRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountStoreRemovedMessagePayloadBuilder builder) {
         CartDiscountStoreRemovedMessagePayload cartDiscountStoreRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountStoreRemovedMessagePayload)
                 .isInstanceOf(CartDiscountStoreRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountStoreRemovedMessagePayload.builder()
+        return new Object[][] { new Object[] { "store", CartDiscountStoreRemovedMessagePayload.builder()
                 .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreRemovedMessageTest.java
index f9dee64c042..4dca366da92 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoreRemovedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountStoreRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountStoreRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountStoreRemovedMessageBuilder builder) {
         CartDiscountStoreRemovedMessage cartDiscountStoreRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountStoreRemovedMessage).isInstanceOf(CartDiscountStoreRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountStoreRemovedMessage.builder()
+        return new Object[][] { new Object[] { "store", CartDiscountStoreRemovedMessage.builder()
                 .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoresSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoresSetMessagePayloadTest.java
index c7774fd7816..82de8831d8b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoresSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoresSetMessagePayloadTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountStoresSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountStoresSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountStoresSetMessagePayloadBuilder builder) {
         CartDiscountStoresSetMessagePayload cartDiscountStoresSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountStoresSetMessagePayload)
                 .isInstanceOf(CartDiscountStoresSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountStoresSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "stores", CartDiscountStoresSetMessagePayload.builder()
                 .stores(Collections.singletonList(new com.commercetools.api.models.store.StoreKeyReferenceImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoresSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoresSetMessageTest.java
index 14b0e99f6c8..3b843ccf1e2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoresSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CartDiscountStoresSetMessageTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountStoresSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartDiscountStoresSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartDiscountStoresSetMessageBuilder builder) {
         CartDiscountStoresSetMessage cartDiscountStoresSetMessage = builder.buildUnchecked();
         Assertions.assertThat(cartDiscountStoresSetMessage).isInstanceOf(CartDiscountStoresSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartDiscountStoresSetMessage.builder()
+        return new Object[][] { new Object[] { "stores", CartDiscountStoresSetMessage.builder()
                 .stores(Collections.singletonList(new com.commercetools.api.models.store.StoreKeyReferenceImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategoryCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategoryCreatedMessagePayloadTest.java
index b564b016837..ac3965791fb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategoryCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategoryCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryCreatedMessagePayloadBuilder builder) {
         CategoryCreatedMessagePayload categoryCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(categoryCreatedMessagePayload).isInstanceOf(CategoryCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategoryCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "category", CategoryCreatedMessagePayload.builder()
                 .category(new com.commercetools.api.models.category.CategoryImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategoryCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategoryCreatedMessageTest.java
index b30b5dd5414..1166b2616fa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategoryCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategoryCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryCreatedMessageBuilder builder) {
         CategoryCreatedMessage categoryCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(categoryCreatedMessage).isInstanceOf(CategoryCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "category",
                 CategoryCreatedMessage.builder().category(new com.commercetools.api.models.category.CategoryImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategorySlugChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategorySlugChangedMessagePayloadTest.java
index 2b13453b3ad..c081ca08527 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategorySlugChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategorySlugChangedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySlugChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySlugChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySlugChangedMessagePayloadBuilder builder) {
         CategorySlugChangedMessagePayload categorySlugChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(categorySlugChangedMessagePayload).isInstanceOf(CategorySlugChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CategorySlugChangedMessagePayload.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CategorySlugChangedMessagePayload.builder()
+                new Object[] { "slug",
+                        CategorySlugChangedMessagePayload.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "oldSlug", CategorySlugChangedMessagePayload.builder()
                         .oldSlug(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategorySlugChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategorySlugChangedMessageTest.java
index 471ad12fb1a..c73d085cc0e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategorySlugChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CategorySlugChangedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategorySlugChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategorySlugChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategorySlugChangedMessageBuilder builder) {
         CategorySlugChangedMessage categorySlugChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(categorySlugChangedMessage).isInstanceOf(CategorySlugChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CategorySlugChangedMessage.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CategorySlugChangedMessage.builder()
+                new Object[] { "slug",
+                        CategorySlugChangedMessage.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "oldSlug", CategorySlugChangedMessage.builder()
                         .oldSlug(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ContainerAndKeyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ContainerAndKeyTest.java
index d3e3771a4c5..ff1d133a437 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ContainerAndKeyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ContainerAndKeyTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ContainerAndKeyTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ContainerAndKeyBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ContainerAndKeyBuilder builder) {
         ContainerAndKey containerAndKey = builder.buildUnchecked();
         Assertions.assertThat(containerAndKey).isInstanceOf(ContainerAndKey.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ContainerAndKey.builder().key("key") },
-                new Object[] { ContainerAndKey.builder().container("container") } };
+        return new Object[][] { new Object[] { "key", ContainerAndKey.builder().key("key") },
+                new Object[] { "container", ContainerAndKey.builder().container("container") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomLineItemStateTransitionMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomLineItemStateTransitionMessagePayloadTest.java
index db487714a5d..e5719382b11 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomLineItemStateTransitionMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomLineItemStateTransitionMessagePayloadTest.java
@@ -3,42 +3,36 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomLineItemStateTransitionMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomLineItemStateTransitionMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomLineItemStateTransitionMessagePayloadBuilder builder) {
         CustomLineItemStateTransitionMessagePayload customLineItemStateTransitionMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customLineItemStateTransitionMessagePayload)
                 .isInstanceOf(CustomLineItemStateTransitionMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         CustomLineItemStateTransitionMessagePayload.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemKey",
                         CustomLineItemStateTransitionMessagePayload.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { CustomLineItemStateTransitionMessagePayload.builder()
-                        .transitionDate(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CustomLineItemStateTransitionMessagePayload.builder().quantity(8L) },
-                new Object[] { CustomLineItemStateTransitionMessagePayload.builder()
-                        .fromState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { CustomLineItemStateTransitionMessagePayload.builder()
+                new Object[] { "transitionDate",
+                        CustomLineItemStateTransitionMessagePayload.builder()
+                                .transitionDate(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "quantity", CustomLineItemStateTransitionMessagePayload.builder().quantity(8L) },
+                new Object[] { "fromState",
+                        CustomLineItemStateTransitionMessagePayload.builder()
+                                .fromState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "toState", CustomLineItemStateTransitionMessagePayload.builder()
                         .toState(new com.commercetools.api.models.state.StateReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomLineItemStateTransitionMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomLineItemStateTransitionMessageTest.java
index 04e2c857dcf..d62d82b8671 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomLineItemStateTransitionMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomLineItemStateTransitionMessageTest.java
@@ -3,39 +3,35 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomLineItemStateTransitionMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomLineItemStateTransitionMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomLineItemStateTransitionMessageBuilder builder) {
         CustomLineItemStateTransitionMessage customLineItemStateTransitionMessage = builder.buildUnchecked();
         Assertions.assertThat(customLineItemStateTransitionMessage)
                 .isInstanceOf(CustomLineItemStateTransitionMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomLineItemStateTransitionMessage.builder().customLineItemId("customLineItemId") },
-                new Object[] { CustomLineItemStateTransitionMessage.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { CustomLineItemStateTransitionMessage.builder()
-                        .transitionDate(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CustomLineItemStateTransitionMessage.builder().quantity(8L) },
-                new Object[] { CustomLineItemStateTransitionMessage.builder()
-                        .fromState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { CustomLineItemStateTransitionMessage.builder()
+                new Object[] { "customLineItemId",
+                        CustomLineItemStateTransitionMessage.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
+                        CustomLineItemStateTransitionMessage.builder().customLineItemKey("customLineItemKey") },
+                new Object[] { "transitionDate",
+                        CustomLineItemStateTransitionMessage.builder()
+                                .transitionDate(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "quantity", CustomLineItemStateTransitionMessage.builder().quantity(8L) },
+                new Object[] { "fromState",
+                        CustomLineItemStateTransitionMessage.builder()
+                                .fromState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "toState", CustomLineItemStateTransitionMessage.builder()
                         .toState(new com.commercetools.api.models.state.StateReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressAddedMessagePayloadTest.java
index e81d00b612d..a60afdb9970 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressAddedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressAddedMessagePayloadBuilder builder) {
         CustomerAddressAddedMessagePayload customerAddressAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerAddressAddedMessagePayload)
                 .isInstanceOf(CustomerAddressAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddressAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "address", CustomerAddressAddedMessagePayload.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressAddedMessageTest.java
index 67b456d16cd..93c46480d05 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressAddedMessageBuilder builder) {
         CustomerAddressAddedMessage customerAddressAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerAddressAddedMessage).isInstanceOf(CustomerAddressAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddressAddedMessage.builder()
+        return new Object[][] { new Object[] { "address", CustomerAddressAddedMessage.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressChangedMessagePayloadTest.java
index 570b0eeb458..ffb4188b336 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressChangedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressChangedMessagePayloadBuilder builder) {
         CustomerAddressChangedMessagePayload customerAddressChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerAddressChangedMessagePayload)
                 .isInstanceOf(CustomerAddressChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddressChangedMessagePayload.builder()
+        return new Object[][] { new Object[] { "address", CustomerAddressChangedMessagePayload.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressChangedMessageTest.java
index 380adcd4d04..6991af6adc2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressChangedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressChangedMessageBuilder builder) {
         CustomerAddressChangedMessage customerAddressChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerAddressChangedMessage).isInstanceOf(CustomerAddressChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddressChangedMessage.builder()
+        return new Object[][] { new Object[] { "address", CustomerAddressChangedMessage.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldAddedMessagePayloadTest.java
index a80fec31ef5..d21f2c89354 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldAddedMessagePayloadTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressCustomFieldAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressCustomFieldAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressCustomFieldAddedMessagePayloadBuilder builder) {
         CustomerAddressCustomFieldAddedMessagePayload customerAddressCustomFieldAddedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customerAddressCustomFieldAddedMessagePayload)
                 .isInstanceOf(CustomerAddressCustomFieldAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddressCustomFieldAddedMessagePayload.builder().name("name") },
-                new Object[] { CustomerAddressCustomFieldAddedMessagePayload.builder().value("value") },
-                new Object[] { CustomerAddressCustomFieldAddedMessagePayload.builder().addressId("addressId") } };
+        return new Object[][] {
+                new Object[] { "name", CustomerAddressCustomFieldAddedMessagePayload.builder().name("name") },
+                new Object[] { "value", CustomerAddressCustomFieldAddedMessagePayload.builder().value("value") },
+                new Object[] { "addressId",
+                        CustomerAddressCustomFieldAddedMessagePayload.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldAddedMessageTest.java
index 16302a90abc..385295eca0e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldAddedMessageTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressCustomFieldAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressCustomFieldAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressCustomFieldAddedMessageBuilder builder) {
         CustomerAddressCustomFieldAddedMessage customerAddressCustomFieldAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerAddressCustomFieldAddedMessage)
                 .isInstanceOf(CustomerAddressCustomFieldAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddressCustomFieldAddedMessage.builder().name("name") },
-                new Object[] { CustomerAddressCustomFieldAddedMessage.builder().value("value") },
-                new Object[] { CustomerAddressCustomFieldAddedMessage.builder().addressId("addressId") } };
+        return new Object[][] { new Object[] { "name", CustomerAddressCustomFieldAddedMessage.builder().name("name") },
+                new Object[] { "value", CustomerAddressCustomFieldAddedMessage.builder().value("value") },
+                new Object[] { "addressId", CustomerAddressCustomFieldAddedMessage.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldChangedMessagePayloadTest.java
index 2fc806d3b10..417c1c5b7ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldChangedMessagePayloadTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressCustomFieldChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressCustomFieldChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressCustomFieldChangedMessagePayloadBuilder builder) {
         CustomerAddressCustomFieldChangedMessagePayload customerAddressCustomFieldChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customerAddressCustomFieldChangedMessagePayload)
                 .isInstanceOf(CustomerAddressCustomFieldChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddressCustomFieldChangedMessagePayload.builder().name("name") },
-                new Object[] { CustomerAddressCustomFieldChangedMessagePayload.builder().value("value") },
-                new Object[] {
+        return new Object[][] {
+                new Object[] { "name", CustomerAddressCustomFieldChangedMessagePayload.builder().name("name") },
+                new Object[] { "value", CustomerAddressCustomFieldChangedMessagePayload.builder().value("value") },
+                new Object[] { "previousValue",
                         CustomerAddressCustomFieldChangedMessagePayload.builder().previousValue("previousValue") },
-                new Object[] { CustomerAddressCustomFieldChangedMessagePayload.builder().addressId("addressId") } };
+                new Object[] { "addressId",
+                        CustomerAddressCustomFieldChangedMessagePayload.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldChangedMessageTest.java
index 4ac5302b356..4f8d29d2351 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldChangedMessageTest.java
@@ -1,34 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressCustomFieldChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressCustomFieldChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressCustomFieldChangedMessageBuilder builder) {
         CustomerAddressCustomFieldChangedMessage customerAddressCustomFieldChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerAddressCustomFieldChangedMessage)
                 .isInstanceOf(CustomerAddressCustomFieldChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddressCustomFieldChangedMessage.builder().name("name") },
-                new Object[] { CustomerAddressCustomFieldChangedMessage.builder().value("value") },
-                new Object[] { CustomerAddressCustomFieldChangedMessage.builder().previousValue("previousValue") },
-                new Object[] { CustomerAddressCustomFieldChangedMessage.builder().addressId("addressId") } };
+        return new Object[][] {
+                new Object[] { "name", CustomerAddressCustomFieldChangedMessage.builder().name("name") },
+                new Object[] { "value", CustomerAddressCustomFieldChangedMessage.builder().value("value") },
+                new Object[] { "previousValue",
+                        CustomerAddressCustomFieldChangedMessage.builder().previousValue("previousValue") },
+                new Object[] { "addressId",
+                        CustomerAddressCustomFieldChangedMessage.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldRemovedMessagePayloadTest.java
index bcf3a9d405d..4ff105d7eea 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldRemovedMessagePayloadTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressCustomFieldRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressCustomFieldRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressCustomFieldRemovedMessagePayloadBuilder builder) {
         CustomerAddressCustomFieldRemovedMessagePayload customerAddressCustomFieldRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customerAddressCustomFieldRemovedMessagePayload)
                 .isInstanceOf(CustomerAddressCustomFieldRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddressCustomFieldRemovedMessagePayload.builder().name("name") },
-                new Object[] { CustomerAddressCustomFieldRemovedMessagePayload.builder().addressId("addressId") } };
+        return new Object[][] {
+                new Object[] { "name", CustomerAddressCustomFieldRemovedMessagePayload.builder().name("name") },
+                new Object[] { "addressId",
+                        CustomerAddressCustomFieldRemovedMessagePayload.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldRemovedMessageTest.java
index 7010927ce90..d714464d39f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomFieldRemovedMessageTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressCustomFieldRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressCustomFieldRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressCustomFieldRemovedMessageBuilder builder) {
         CustomerAddressCustomFieldRemovedMessage customerAddressCustomFieldRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerAddressCustomFieldRemovedMessage)
                 .isInstanceOf(CustomerAddressCustomFieldRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddressCustomFieldRemovedMessage.builder().name("name") },
-                new Object[] { CustomerAddressCustomFieldRemovedMessage.builder().addressId("addressId") } };
+        return new Object[][] {
+                new Object[] { "name", CustomerAddressCustomFieldRemovedMessage.builder().name("name") }, new Object[] {
+                        "addressId", CustomerAddressCustomFieldRemovedMessage.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeRemovedMessagePayloadTest.java
index 780c41b434b..370da6ad7af 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeRemovedMessagePayloadTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressCustomTypeRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressCustomTypeRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressCustomTypeRemovedMessagePayloadBuilder builder) {
         CustomerAddressCustomTypeRemovedMessagePayload customerAddressCustomTypeRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customerAddressCustomTypeRemovedMessagePayload)
                 .isInstanceOf(CustomerAddressCustomTypeRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "previousTypeId",
                         CustomerAddressCustomTypeRemovedMessagePayload.builder().previousTypeId("previousTypeId") },
-                new Object[] { CustomerAddressCustomTypeRemovedMessagePayload.builder().addressId("addressId") } };
+                new Object[] { "addressId",
+                        CustomerAddressCustomTypeRemovedMessagePayload.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeRemovedMessageTest.java
index 47293d21987..95a18c0cc6c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeRemovedMessageTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressCustomTypeRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressCustomTypeRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressCustomTypeRemovedMessageBuilder builder) {
         CustomerAddressCustomTypeRemovedMessage customerAddressCustomTypeRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerAddressCustomTypeRemovedMessage)
                 .isInstanceOf(CustomerAddressCustomTypeRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerAddressCustomTypeRemovedMessage.builder().previousTypeId("previousTypeId") },
-                new Object[] { CustomerAddressCustomTypeRemovedMessage.builder().addressId("addressId") } };
+                new Object[] { "previousTypeId",
+                        CustomerAddressCustomTypeRemovedMessage.builder().previousTypeId("previousTypeId") },
+                new Object[] { "addressId",
+                        CustomerAddressCustomTypeRemovedMessage.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeSetMessagePayloadTest.java
index 9c281216b4d..8492ab55bca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeSetMessagePayloadTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressCustomTypeSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressCustomTypeSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressCustomTypeSetMessagePayloadBuilder builder) {
         CustomerAddressCustomTypeSetMessagePayload customerAddressCustomTypeSetMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customerAddressCustomTypeSetMessagePayload)
                 .isInstanceOf(CustomerAddressCustomTypeSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerAddressCustomTypeSetMessagePayload.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { CustomerAddressCustomTypeSetMessagePayload.builder().previousTypeId("previousTypeId") },
-                new Object[] { CustomerAddressCustomTypeSetMessagePayload.builder().addressId("addressId") } };
+                new Object[] { "customFields",
+                        CustomerAddressCustomTypeSetMessagePayload.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "previousTypeId",
+                        CustomerAddressCustomTypeSetMessagePayload.builder().previousTypeId("previousTypeId") },
+                new Object[] { "addressId",
+                        CustomerAddressCustomTypeSetMessagePayload.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeSetMessageTest.java
index cc6ef03f3b3..9fbaa1c4cd9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressCustomTypeSetMessageTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressCustomTypeSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressCustomTypeSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressCustomTypeSetMessageBuilder builder) {
         CustomerAddressCustomTypeSetMessage customerAddressCustomTypeSetMessage = builder.buildUnchecked();
         Assertions.assertThat(customerAddressCustomTypeSetMessage)
                 .isInstanceOf(CustomerAddressCustomTypeSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerAddressCustomTypeSetMessage.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { CustomerAddressCustomTypeSetMessage.builder().previousTypeId("previousTypeId") },
-                new Object[] { CustomerAddressCustomTypeSetMessage.builder().addressId("addressId") } };
+                new Object[] { "customFields",
+                        CustomerAddressCustomTypeSetMessage.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "previousTypeId",
+                        CustomerAddressCustomTypeSetMessage.builder().previousTypeId("previousTypeId") },
+                new Object[] { "addressId", CustomerAddressCustomTypeSetMessage.builder().addressId("addressId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressRemovedMessagePayloadTest.java
index 3324d9601d6..8d235b5a453 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressRemovedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressRemovedMessagePayloadBuilder builder) {
         CustomerAddressRemovedMessagePayload customerAddressRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerAddressRemovedMessagePayload)
                 .isInstanceOf(CustomerAddressRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddressRemovedMessagePayload.builder()
+        return new Object[][] { new Object[] { "address", CustomerAddressRemovedMessagePayload.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressRemovedMessageTest.java
index 3c56c1326b6..992aacc4086 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerAddressRemovedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressRemovedMessageBuilder builder) {
         CustomerAddressRemovedMessage customerAddressRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerAddressRemovedMessage).isInstanceOf(CustomerAddressRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddressRemovedMessage.builder()
+        return new Object[][] { new Object[] { "address", CustomerAddressRemovedMessage.builder()
                 .address(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCompanyNameSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCompanyNameSetMessagePayloadTest.java
index 9abf6adaff0..a80747d2292 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCompanyNameSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCompanyNameSetMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCompanyNameSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCompanyNameSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCompanyNameSetMessagePayloadBuilder builder) {
         CustomerCompanyNameSetMessagePayload customerCompanyNameSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerCompanyNameSetMessagePayload)
                 .isInstanceOf(CustomerCompanyNameSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { CustomerCompanyNameSetMessagePayload.builder().companyName("companyName") } };
+        return new Object[][] { new Object[] { "companyName",
+                CustomerCompanyNameSetMessagePayload.builder().companyName("companyName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCompanyNameSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCompanyNameSetMessageTest.java
index c5f14ff6dbe..640dffdeffa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCompanyNameSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCompanyNameSetMessageTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCompanyNameSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCompanyNameSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCompanyNameSetMessageBuilder builder) {
         CustomerCompanyNameSetMessage customerCompanyNameSetMessage = builder.buildUnchecked();
         Assertions.assertThat(customerCompanyNameSetMessage).isInstanceOf(CustomerCompanyNameSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerCompanyNameSetMessage.builder().companyName("companyName") } };
+        return new Object[][] {
+                new Object[] { "companyName", CustomerCompanyNameSetMessage.builder().companyName("companyName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCreatedMessagePayloadTest.java
index 75b9d963780..9fe2a5b2f6b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCreatedMessagePayloadBuilder builder) {
         CustomerCreatedMessagePayload customerCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerCreatedMessagePayload).isInstanceOf(CustomerCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "customer", CustomerCreatedMessagePayload.builder()
                 .customer(new com.commercetools.api.models.customer.CustomerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCreatedMessageTest.java
index 92cea25c149..7819d5f1149 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCreatedMessageBuilder builder) {
         CustomerCreatedMessage customerCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerCreatedMessage).isInstanceOf(CustomerCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "customer",
                 CustomerCreatedMessage.builder().customer(new com.commercetools.api.models.customer.CustomerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldAddedMessagePayloadTest.java
index ab7f4eb3a9e..04316328361 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldAddedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCustomFieldAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCustomFieldAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCustomFieldAddedMessagePayloadBuilder builder) {
         CustomerCustomFieldAddedMessagePayload customerCustomFieldAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerCustomFieldAddedMessagePayload)
                 .isInstanceOf(CustomerCustomFieldAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerCustomFieldAddedMessagePayload.builder().name("name") },
-                new Object[] { CustomerCustomFieldAddedMessagePayload.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", CustomerCustomFieldAddedMessagePayload.builder().name("name") },
+                new Object[] { "value", CustomerCustomFieldAddedMessagePayload.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldAddedMessageTest.java
index b874a627c89..b6fff82d77c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldAddedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCustomFieldAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCustomFieldAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCustomFieldAddedMessageBuilder builder) {
         CustomerCustomFieldAddedMessage customerCustomFieldAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerCustomFieldAddedMessage).isInstanceOf(CustomerCustomFieldAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerCustomFieldAddedMessage.builder().name("name") },
-                new Object[] { CustomerCustomFieldAddedMessage.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", CustomerCustomFieldAddedMessage.builder().name("name") },
+                new Object[] { "value", CustomerCustomFieldAddedMessage.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldChangedMessagePayloadTest.java
index f2082f75398..8ae03d3dea8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldChangedMessagePayloadTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCustomFieldChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCustomFieldChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCustomFieldChangedMessagePayloadBuilder builder) {
         CustomerCustomFieldChangedMessagePayload customerCustomFieldChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerCustomFieldChangedMessagePayload)
                 .isInstanceOf(CustomerCustomFieldChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerCustomFieldChangedMessagePayload.builder().name("name") },
-                new Object[] { CustomerCustomFieldChangedMessagePayload.builder().value("value") },
-                new Object[] { CustomerCustomFieldChangedMessagePayload.builder().previousValue("previousValue") } };
+        return new Object[][] {
+                new Object[] { "name", CustomerCustomFieldChangedMessagePayload.builder().name("name") },
+                new Object[] { "value", CustomerCustomFieldChangedMessagePayload.builder().value("value") },
+                new Object[] { "previousValue",
+                        CustomerCustomFieldChangedMessagePayload.builder().previousValue("previousValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldChangedMessageTest.java
index 821d16c6872..7e2008d56db 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldChangedMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCustomFieldChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCustomFieldChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCustomFieldChangedMessageBuilder builder) {
         CustomerCustomFieldChangedMessage customerCustomFieldChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerCustomFieldChangedMessage).isInstanceOf(CustomerCustomFieldChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerCustomFieldChangedMessage.builder().name("name") },
-                new Object[] { CustomerCustomFieldChangedMessage.builder().value("value") },
-                new Object[] { CustomerCustomFieldChangedMessage.builder().previousValue("previousValue") } };
+        return new Object[][] { new Object[] { "name", CustomerCustomFieldChangedMessage.builder().name("name") },
+                new Object[] { "value", CustomerCustomFieldChangedMessage.builder().value("value") }, new Object[] {
+                        "previousValue", CustomerCustomFieldChangedMessage.builder().previousValue("previousValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldRemovedMessagePayloadTest.java
index 6c196bda41c..470311bbabe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldRemovedMessagePayloadTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCustomFieldRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCustomFieldRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCustomFieldRemovedMessagePayloadBuilder builder) {
         CustomerCustomFieldRemovedMessagePayload customerCustomFieldRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerCustomFieldRemovedMessagePayload)
                 .isInstanceOf(CustomerCustomFieldRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerCustomFieldRemovedMessagePayload.builder().name("name") } };
+        return new Object[][] {
+                new Object[] { "name", CustomerCustomFieldRemovedMessagePayload.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldRemovedMessageTest.java
index cd8c69dc51c..71aa533a4f9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomFieldRemovedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCustomFieldRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCustomFieldRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCustomFieldRemovedMessageBuilder builder) {
         CustomerCustomFieldRemovedMessage customerCustomFieldRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerCustomFieldRemovedMessage).isInstanceOf(CustomerCustomFieldRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerCustomFieldRemovedMessage.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", CustomerCustomFieldRemovedMessage.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeRemovedMessagePayloadTest.java
index 4653e28ad83..c93f12fd37a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeRemovedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCustomTypeRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCustomTypeRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCustomTypeRemovedMessagePayloadBuilder builder) {
         CustomerCustomTypeRemovedMessagePayload customerCustomTypeRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerCustomTypeRemovedMessagePayload)
                 .isInstanceOf(CustomerCustomTypeRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { CustomerCustomTypeRemovedMessagePayload.builder().previousTypeId("previousTypeId") } };
+        return new Object[][] { new Object[] { "previousTypeId",
+                CustomerCustomTypeRemovedMessagePayload.builder().previousTypeId("previousTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeRemovedMessageTest.java
index afd715c7129..95189f03e5c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeRemovedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCustomTypeRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCustomTypeRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCustomTypeRemovedMessageBuilder builder) {
         CustomerCustomTypeRemovedMessage customerCustomTypeRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerCustomTypeRemovedMessage).isInstanceOf(CustomerCustomTypeRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { CustomerCustomTypeRemovedMessage.builder().previousTypeId("previousTypeId") } };
+        return new Object[][] { new Object[] { "previousTypeId",
+                CustomerCustomTypeRemovedMessage.builder().previousTypeId("previousTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeSetMessagePayloadTest.java
index 83d7e9fcddc..275049d1bae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeSetMessagePayloadTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCustomTypeSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCustomTypeSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCustomTypeSetMessagePayloadBuilder builder) {
         CustomerCustomTypeSetMessagePayload customerCustomTypeSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerCustomTypeSetMessagePayload)
                 .isInstanceOf(CustomerCustomTypeSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerCustomTypeSetMessagePayload.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { CustomerCustomTypeSetMessagePayload.builder().previousTypeId("previousTypeId") } };
+                new Object[] { "customFields",
+                        CustomerCustomTypeSetMessagePayload.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "previousTypeId",
+                        CustomerCustomTypeSetMessagePayload.builder().previousTypeId("previousTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeSetMessageTest.java
index bd707b7ae84..657d927c58b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerCustomTypeSetMessageTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerCustomTypeSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerCustomTypeSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerCustomTypeSetMessageBuilder builder) {
         CustomerCustomTypeSetMessage customerCustomTypeSetMessage = builder.buildUnchecked();
         Assertions.assertThat(customerCustomTypeSetMessage).isInstanceOf(CustomerCustomTypeSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerCustomTypeSetMessage.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { CustomerCustomTypeSetMessage.builder().previousTypeId("previousTypeId") } };
+                new Object[] { "customFields",
+                        CustomerCustomTypeSetMessage.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "previousTypeId",
+                        CustomerCustomTypeSetMessage.builder().previousTypeId("previousTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDateOfBirthSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDateOfBirthSetMessagePayloadTest.java
index 56614c24c43..779697245a4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDateOfBirthSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDateOfBirthSetMessagePayloadTest.java
@@ -3,31 +3,23 @@
 
 import java.time.LocalDate;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerDateOfBirthSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerDateOfBirthSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerDateOfBirthSetMessagePayloadBuilder builder) {
         CustomerDateOfBirthSetMessagePayload customerDateOfBirthSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerDateOfBirthSetMessagePayload)
                 .isInstanceOf(CustomerDateOfBirthSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "dateOfBirth",
                 CustomerDateOfBirthSetMessagePayload.builder().dateOfBirth(LocalDate.parse("2023-06-01")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDateOfBirthSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDateOfBirthSetMessageTest.java
index 432ab22d272..880284affa6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDateOfBirthSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDateOfBirthSetMessageTest.java
@@ -3,31 +3,23 @@
 
 import java.time.LocalDate;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerDateOfBirthSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerDateOfBirthSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerDateOfBirthSetMessageBuilder builder) {
         CustomerDateOfBirthSetMessage customerDateOfBirthSetMessage = builder.buildUnchecked();
         Assertions.assertThat(customerDateOfBirthSetMessage).isInstanceOf(CustomerDateOfBirthSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { CustomerDateOfBirthSetMessage.builder().dateOfBirth(LocalDate.parse("2023-06-01")) } };
+        return new Object[][] { new Object[] { "dateOfBirth",
+                CustomerDateOfBirthSetMessage.builder().dateOfBirth(LocalDate.parse("2023-06-01")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDeletedMessagePayloadTest.java
index 0e1d81df2fe..cf3e783cf03 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDeletedMessagePayloadTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerDeletedMessagePayloadTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDeletedMessageTest.java
index c024570bd10..38c1ad5d9cc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerDeletedMessageTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerDeletedMessageTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailChangedMessagePayloadTest.java
index 023f7c7ec13..ebb2fe5ebdb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailChangedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerEmailChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerEmailChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerEmailChangedMessagePayloadBuilder builder) {
         CustomerEmailChangedMessagePayload customerEmailChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerEmailChangedMessagePayload)
                 .isInstanceOf(CustomerEmailChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerEmailChangedMessagePayload.builder().email("email") } };
+        return new Object[][] { new Object[] { "email", CustomerEmailChangedMessagePayload.builder().email("email") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailChangedMessageTest.java
index bc6db4f9611..4195ce1341e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailChangedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerEmailChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerEmailChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerEmailChangedMessageBuilder builder) {
         CustomerEmailChangedMessage customerEmailChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerEmailChangedMessage).isInstanceOf(CustomerEmailChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerEmailChangedMessage.builder().email("email") } };
+        return new Object[][] { new Object[] { "email", CustomerEmailChangedMessage.builder().email("email") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailTokenCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailTokenCreatedMessagePayloadTest.java
index 6f2ccfc4ac5..b33111f55a7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailTokenCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailTokenCreatedMessagePayloadTest.java
@@ -3,33 +3,26 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerEmailTokenCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerEmailTokenCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerEmailTokenCreatedMessagePayloadBuilder builder) {
         CustomerEmailTokenCreatedMessagePayload customerEmailTokenCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerEmailTokenCreatedMessagePayload)
                 .isInstanceOf(CustomerEmailTokenCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerEmailTokenCreatedMessagePayload.builder().customerId("customerId") },
-                new Object[] { CustomerEmailTokenCreatedMessagePayload.builder()
+                new Object[] { "customerId",
+                        CustomerEmailTokenCreatedMessagePayload.builder().customerId("customerId") },
+                new Object[] { "expiresAt", CustomerEmailTokenCreatedMessagePayload.builder()
                         .expiresAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailTokenCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailTokenCreatedMessageTest.java
index 6d182ec0137..b8fd0ebd87f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailTokenCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailTokenCreatedMessageTest.java
@@ -3,31 +3,24 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerEmailTokenCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerEmailTokenCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerEmailTokenCreatedMessageBuilder builder) {
         CustomerEmailTokenCreatedMessage customerEmailTokenCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerEmailTokenCreatedMessage).isInstanceOf(CustomerEmailTokenCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerEmailTokenCreatedMessage.builder().customerId("customerId") },
-                new Object[] { CustomerEmailTokenCreatedMessage.builder()
+        return new Object[][] {
+                new Object[] { "customerId", CustomerEmailTokenCreatedMessage.builder().customerId("customerId") },
+                new Object[] { "expiresAt", CustomerEmailTokenCreatedMessage.builder()
                         .expiresAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailVerifiedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailVerifiedMessagePayloadTest.java
index cc30e3a957d..8994d21515c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailVerifiedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailVerifiedMessagePayloadTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerEmailVerifiedMessagePayloadTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailVerifiedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailVerifiedMessageTest.java
index c47d4057470..8454300100c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailVerifiedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerEmailVerifiedMessageTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerEmailVerifiedMessageTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerFirstNameSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerFirstNameSetMessagePayloadTest.java
index 9fe77425d67..45d89b91dcf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerFirstNameSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerFirstNameSetMessagePayloadTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerFirstNameSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerFirstNameSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerFirstNameSetMessagePayloadBuilder builder) {
         CustomerFirstNameSetMessagePayload customerFirstNameSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerFirstNameSetMessagePayload)
                 .isInstanceOf(CustomerFirstNameSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerFirstNameSetMessagePayload.builder().firstName("firstName") } };
+        return new Object[][] {
+                new Object[] { "firstName", CustomerFirstNameSetMessagePayload.builder().firstName("firstName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerFirstNameSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerFirstNameSetMessageTest.java
index e8c177929bb..f77f36f58a6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerFirstNameSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerFirstNameSetMessageTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerFirstNameSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerFirstNameSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerFirstNameSetMessageBuilder builder) {
         CustomerFirstNameSetMessage customerFirstNameSetMessage = builder.buildUnchecked();
         Assertions.assertThat(customerFirstNameSetMessage).isInstanceOf(CustomerFirstNameSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerFirstNameSetMessage.builder().firstName("firstName") } };
+        return new Object[][] {
+                new Object[] { "firstName", CustomerFirstNameSetMessage.builder().firstName("firstName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentAddedMessagePayloadTest.java
index 8bb132beab6..bca9e8b0d87 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentAddedMessagePayloadTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupAssignmentAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupAssignmentAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupAssignmentAddedMessagePayloadBuilder builder) {
         CustomerGroupAssignmentAddedMessagePayload customerGroupAssignmentAddedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customerGroupAssignmentAddedMessagePayload)
                 .isInstanceOf(CustomerGroupAssignmentAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupAssignmentAddedMessagePayload.builder()
-                .customerGroupAssignment(new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl()) } };
+        return new Object[][] { new Object[] { "customerGroupAssignment",
+                CustomerGroupAssignmentAddedMessagePayload.builder()
+                        .customerGroupAssignment(
+                            new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentAddedMessageTest.java
index 0b29f19950c..2ac57212905 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentAddedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupAssignmentAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupAssignmentAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupAssignmentAddedMessageBuilder builder) {
         CustomerGroupAssignmentAddedMessage customerGroupAssignmentAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerGroupAssignmentAddedMessage)
                 .isInstanceOf(CustomerGroupAssignmentAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupAssignmentAddedMessage.builder()
+        return new Object[][] { new Object[] { "customerGroupAssignment", CustomerGroupAssignmentAddedMessage.builder()
                 .customerGroupAssignment(new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentRemovedMessagePayloadTest.java
index 8e81b84df1c..b2bfb795b2a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentRemovedMessagePayloadTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupAssignmentRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupAssignmentRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupAssignmentRemovedMessagePayloadBuilder builder) {
         CustomerGroupAssignmentRemovedMessagePayload customerGroupAssignmentRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customerGroupAssignmentRemovedMessagePayload)
                 .isInstanceOf(CustomerGroupAssignmentRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupAssignmentRemovedMessagePayload.builder()
-                .customerGroupAssignment(new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl()) } };
+        return new Object[][] { new Object[] { "customerGroupAssignment",
+                CustomerGroupAssignmentRemovedMessagePayload.builder()
+                        .customerGroupAssignment(
+                            new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentRemovedMessageTest.java
index bf5826cc35f..9dbdcc44cfd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentRemovedMessageTest.java
@@ -1,32 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupAssignmentRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupAssignmentRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupAssignmentRemovedMessageBuilder builder) {
         CustomerGroupAssignmentRemovedMessage customerGroupAssignmentRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerGroupAssignmentRemovedMessage)
                 .isInstanceOf(CustomerGroupAssignmentRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupAssignmentRemovedMessage.builder()
-                .customerGroupAssignment(new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl()) } };
+        return new Object[][] { new Object[] { "customerGroupAssignment",
+                CustomerGroupAssignmentRemovedMessage.builder()
+                        .customerGroupAssignment(
+                            new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentsSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentsSetMessagePayloadTest.java
index 88d2f2dc37f..addbb408ef4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentsSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentsSetMessagePayloadTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupAssignmentsSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupAssignmentsSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupAssignmentsSetMessagePayloadBuilder builder) {
         CustomerGroupAssignmentsSetMessagePayload customerGroupAssignmentsSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerGroupAssignmentsSetMessagePayload)
                 .isInstanceOf(CustomerGroupAssignmentsSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupAssignmentsSetMessagePayload.builder()
-                .customerGroupAssignments(Collections
-                        .singletonList(new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl())) } };
+        return new Object[][] { new Object[] { "customerGroupAssignments",
+                CustomerGroupAssignmentsSetMessagePayload.builder()
+                        .customerGroupAssignments(Collections.singletonList(
+                            new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentsSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentsSetMessageTest.java
index 0880dda985f..8f908a3c974 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentsSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupAssignmentsSetMessageTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupAssignmentsSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupAssignmentsSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupAssignmentsSetMessageBuilder builder) {
         CustomerGroupAssignmentsSetMessage customerGroupAssignmentsSetMessage = builder.buildUnchecked();
         Assertions.assertThat(customerGroupAssignmentsSetMessage)
                 .isInstanceOf(CustomerGroupAssignmentsSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupAssignmentsSetMessage.builder()
-                .customerGroupAssignments(Collections
-                        .singletonList(new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl())) } };
+        return new Object[][] { new Object[] { "customerGroupAssignments",
+                CustomerGroupAssignmentsSetMessage.builder()
+                        .customerGroupAssignments(Collections.singletonList(
+                            new com.commercetools.api.models.customer.CustomerGroupAssignmentImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldAddedMessagePayloadTest.java
index bfde43136df..8b616caffb5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldAddedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupCustomFieldAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupCustomFieldAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupCustomFieldAddedMessagePayloadBuilder builder) {
         CustomerGroupCustomFieldAddedMessagePayload customerGroupCustomFieldAddedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customerGroupCustomFieldAddedMessagePayload)
                 .isInstanceOf(CustomerGroupCustomFieldAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupCustomFieldAddedMessagePayload.builder().name("name") },
-                new Object[] { CustomerGroupCustomFieldAddedMessagePayload.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "name", CustomerGroupCustomFieldAddedMessagePayload.builder().name("name") },
+                new Object[] { "value", CustomerGroupCustomFieldAddedMessagePayload.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldAddedMessageTest.java
index ef724588143..f6f6514c4a8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldAddedMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupCustomFieldAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupCustomFieldAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupCustomFieldAddedMessageBuilder builder) {
         CustomerGroupCustomFieldAddedMessage customerGroupCustomFieldAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerGroupCustomFieldAddedMessage)
                 .isInstanceOf(CustomerGroupCustomFieldAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupCustomFieldAddedMessage.builder().name("name") },
-                new Object[] { CustomerGroupCustomFieldAddedMessage.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", CustomerGroupCustomFieldAddedMessage.builder().name("name") },
+                new Object[] { "value", CustomerGroupCustomFieldAddedMessage.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldChangedMessagePayloadTest.java
index dbd38e6d5e5..6a5a1b04809 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldChangedMessagePayloadTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupCustomFieldChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupCustomFieldChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupCustomFieldChangedMessagePayloadBuilder builder) {
         CustomerGroupCustomFieldChangedMessagePayload customerGroupCustomFieldChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customerGroupCustomFieldChangedMessagePayload)
                 .isInstanceOf(CustomerGroupCustomFieldChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupCustomFieldChangedMessagePayload.builder().name("name") },
-                new Object[] { CustomerGroupCustomFieldChangedMessagePayload.builder().value("value") },
-                new Object[] { CustomerGroupCustomFieldChangedMessagePayload.builder().oldValue("oldValue") } };
+        return new Object[][] {
+                new Object[] { "name", CustomerGroupCustomFieldChangedMessagePayload.builder().name("name") },
+                new Object[] { "value", CustomerGroupCustomFieldChangedMessagePayload.builder().value("value") },
+                new Object[] { "oldValue",
+                        CustomerGroupCustomFieldChangedMessagePayload.builder().oldValue("oldValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldChangedMessageTest.java
index c00a8223f80..b7ddd06f901 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldChangedMessageTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupCustomFieldChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupCustomFieldChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupCustomFieldChangedMessageBuilder builder) {
         CustomerGroupCustomFieldChangedMessage customerGroupCustomFieldChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerGroupCustomFieldChangedMessage)
                 .isInstanceOf(CustomerGroupCustomFieldChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupCustomFieldChangedMessage.builder().name("name") },
-                new Object[] { CustomerGroupCustomFieldChangedMessage.builder().value("value") },
-                new Object[] { CustomerGroupCustomFieldChangedMessage.builder().oldValue("oldValue") } };
+        return new Object[][] { new Object[] { "name", CustomerGroupCustomFieldChangedMessage.builder().name("name") },
+                new Object[] { "value", CustomerGroupCustomFieldChangedMessage.builder().value("value") },
+                new Object[] { "oldValue", CustomerGroupCustomFieldChangedMessage.builder().oldValue("oldValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldRemovedMessagePayloadTest.java
index d53e0e60bd7..3949e3fe8c9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldRemovedMessagePayloadTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupCustomFieldRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupCustomFieldRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupCustomFieldRemovedMessagePayloadBuilder builder) {
         CustomerGroupCustomFieldRemovedMessagePayload customerGroupCustomFieldRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customerGroupCustomFieldRemovedMessagePayload)
                 .isInstanceOf(CustomerGroupCustomFieldRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupCustomFieldRemovedMessagePayload.builder().name("name") } };
+        return new Object[][] {
+                new Object[] { "name", CustomerGroupCustomFieldRemovedMessagePayload.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldRemovedMessageTest.java
index f00c3d9a4b6..929d845e78e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomFieldRemovedMessageTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupCustomFieldRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupCustomFieldRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupCustomFieldRemovedMessageBuilder builder) {
         CustomerGroupCustomFieldRemovedMessage customerGroupCustomFieldRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerGroupCustomFieldRemovedMessage)
                 .isInstanceOf(CustomerGroupCustomFieldRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupCustomFieldRemovedMessage.builder().name("name") } };
+        return new Object[][] {
+                new Object[] { "name", CustomerGroupCustomFieldRemovedMessage.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeRemovedMessagePayloadTest.java
index c670b11bf37..1984c5477cb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeRemovedMessagePayloadTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupCustomTypeRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupCustomTypeRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupCustomTypeRemovedMessagePayloadBuilder builder) {
         CustomerGroupCustomTypeRemovedMessagePayload customerGroupCustomTypeRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customerGroupCustomTypeRemovedMessagePayload)
                 .isInstanceOf(CustomerGroupCustomTypeRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { CustomerGroupCustomTypeRemovedMessagePayload.builder().oldTypeId("oldTypeId") } };
+        return new Object[][] { new Object[] { "oldTypeId",
+                CustomerGroupCustomTypeRemovedMessagePayload.builder().oldTypeId("oldTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeRemovedMessageTest.java
index 03f07231c08..07f68065378 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeRemovedMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupCustomTypeRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupCustomTypeRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupCustomTypeRemovedMessageBuilder builder) {
         CustomerGroupCustomTypeRemovedMessage customerGroupCustomTypeRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerGroupCustomTypeRemovedMessage)
                 .isInstanceOf(CustomerGroupCustomTypeRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerGroupCustomTypeRemovedMessage.builder().oldTypeId("oldTypeId") } };
+                new Object[] { "oldTypeId", CustomerGroupCustomTypeRemovedMessage.builder().oldTypeId("oldTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeSetMessagePayloadTest.java
index 12e7c5de94c..9098496b526 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeSetMessagePayloadTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupCustomTypeSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupCustomTypeSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupCustomTypeSetMessagePayloadBuilder builder) {
         CustomerGroupCustomTypeSetMessagePayload customerGroupCustomTypeSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerGroupCustomTypeSetMessagePayload)
                 .isInstanceOf(CustomerGroupCustomTypeSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerGroupCustomTypeSetMessagePayload.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { CustomerGroupCustomTypeSetMessagePayload.builder().oldTypeId("oldTypeId") } };
+                new Object[] { "customFields",
+                        CustomerGroupCustomTypeSetMessagePayload.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "oldTypeId",
+                        CustomerGroupCustomTypeSetMessagePayload.builder().oldTypeId("oldTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeSetMessageTest.java
index b292d340a4a..2e831f63012 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupCustomTypeSetMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupCustomTypeSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupCustomTypeSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupCustomTypeSetMessageBuilder builder) {
         CustomerGroupCustomTypeSetMessage customerGroupCustomTypeSetMessage = builder.buildUnchecked();
         Assertions.assertThat(customerGroupCustomTypeSetMessage).isInstanceOf(CustomerGroupCustomTypeSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerGroupCustomTypeSetMessage.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { CustomerGroupCustomTypeSetMessage.builder().oldTypeId("oldTypeId") } };
+                new Object[] { "customFields",
+                        CustomerGroupCustomTypeSetMessage.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "oldTypeId", CustomerGroupCustomTypeSetMessage.builder().oldTypeId("oldTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupSetMessagePayloadTest.java
index eb9f5648b74..3809d5732e1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupSetMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupSetMessagePayloadBuilder builder) {
         CustomerGroupSetMessagePayload customerGroupSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerGroupSetMessagePayload).isInstanceOf(CustomerGroupSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "customerGroup", CustomerGroupSetMessagePayload.builder()
                 .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupSetMessageTest.java
index 5f6b003fd75..ff779e5215a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerGroupSetMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerGroupSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerGroupSetMessageBuilder builder) {
         CustomerGroupSetMessage customerGroupSetMessage = builder.buildUnchecked();
         Assertions.assertThat(customerGroupSetMessage).isInstanceOf(CustomerGroupSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerGroupSetMessage.builder()
+        return new Object[][] { new Object[] { "customerGroup", CustomerGroupSetMessage.builder()
                 .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerLastNameSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerLastNameSetMessagePayloadTest.java
index 064da24f96d..59c7c6e6f5d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerLastNameSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerLastNameSetMessagePayloadTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerLastNameSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerLastNameSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerLastNameSetMessagePayloadBuilder builder) {
         CustomerLastNameSetMessagePayload customerLastNameSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerLastNameSetMessagePayload).isInstanceOf(CustomerLastNameSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerLastNameSetMessagePayload.builder().lastName("lastName") } };
+        return new Object[][] {
+                new Object[] { "lastName", CustomerLastNameSetMessagePayload.builder().lastName("lastName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerLastNameSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerLastNameSetMessageTest.java
index 5796d191cae..0a492f09793 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerLastNameSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerLastNameSetMessageTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerLastNameSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerLastNameSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerLastNameSetMessageBuilder builder) {
         CustomerLastNameSetMessage customerLastNameSetMessage = builder.buildUnchecked();
         Assertions.assertThat(customerLastNameSetMessage).isInstanceOf(CustomerLastNameSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerLastNameSetMessage.builder().lastName("lastName") } };
+        return new Object[][] {
+                new Object[] { "lastName", CustomerLastNameSetMessage.builder().lastName("lastName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordTokenCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordTokenCreatedMessagePayloadTest.java
index abc32d1f38d..5a118f26f4a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordTokenCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordTokenCreatedMessagePayloadTest.java
@@ -3,34 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerPasswordTokenCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerPasswordTokenCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerPasswordTokenCreatedMessagePayloadBuilder builder) {
         CustomerPasswordTokenCreatedMessagePayload customerPasswordTokenCreatedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(customerPasswordTokenCreatedMessagePayload)
                 .isInstanceOf(CustomerPasswordTokenCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomerPasswordTokenCreatedMessagePayload.builder().customerId("customerId") },
-                new Object[] { CustomerPasswordTokenCreatedMessagePayload.builder()
+                new Object[] { "customerId",
+                        CustomerPasswordTokenCreatedMessagePayload.builder().customerId("customerId") },
+                new Object[] { "expiresAt", CustomerPasswordTokenCreatedMessagePayload.builder()
                         .expiresAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordTokenCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordTokenCreatedMessageTest.java
index 265bae43c84..26ca16c3f70 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordTokenCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordTokenCreatedMessageTest.java
@@ -3,32 +3,25 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerPasswordTokenCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerPasswordTokenCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerPasswordTokenCreatedMessageBuilder builder) {
         CustomerPasswordTokenCreatedMessage customerPasswordTokenCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerPasswordTokenCreatedMessage)
                 .isInstanceOf(CustomerPasswordTokenCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerPasswordTokenCreatedMessage.builder().customerId("customerId") },
-                new Object[] { CustomerPasswordTokenCreatedMessage.builder()
+        return new Object[][] {
+                new Object[] { "customerId", CustomerPasswordTokenCreatedMessage.builder().customerId("customerId") },
+                new Object[] { "expiresAt", CustomerPasswordTokenCreatedMessage.builder()
                         .expiresAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordUpdatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordUpdatedMessagePayloadTest.java
index 3e3804d9028..b4f5ea4150f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordUpdatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordUpdatedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerPasswordUpdatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerPasswordUpdatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerPasswordUpdatedMessagePayloadBuilder builder) {
         CustomerPasswordUpdatedMessagePayload customerPasswordUpdatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerPasswordUpdatedMessagePayload)
                 .isInstanceOf(CustomerPasswordUpdatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerPasswordUpdatedMessagePayload.builder().reset(true) } };
+        return new Object[][] { new Object[] { "reset", CustomerPasswordUpdatedMessagePayload.builder().reset(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordUpdatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordUpdatedMessageTest.java
index 7b2ddf928c1..a47976035fb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordUpdatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerPasswordUpdatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerPasswordUpdatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerPasswordUpdatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerPasswordUpdatedMessageBuilder builder) {
         CustomerPasswordUpdatedMessage customerPasswordUpdatedMessage = builder.buildUnchecked();
         Assertions.assertThat(customerPasswordUpdatedMessage).isInstanceOf(CustomerPasswordUpdatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerPasswordUpdatedMessage.builder().reset(true) } };
+        return new Object[][] { new Object[] { "reset", CustomerPasswordUpdatedMessage.builder().reset(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerTitleSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerTitleSetMessagePayloadTest.java
index 33b5ee69188..d1e6f838d88 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerTitleSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerTitleSetMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerTitleSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerTitleSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerTitleSetMessagePayloadBuilder builder) {
         CustomerTitleSetMessagePayload customerTitleSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(customerTitleSetMessagePayload).isInstanceOf(CustomerTitleSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerTitleSetMessagePayload.builder().title("title") } };
+        return new Object[][] { new Object[] { "title", CustomerTitleSetMessagePayload.builder().title("title") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerTitleSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerTitleSetMessageTest.java
index 3a2c277b8e9..1a01431a09c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerTitleSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/CustomerTitleSetMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerTitleSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerTitleSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerTitleSetMessageBuilder builder) {
         CustomerTitleSetMessage customerTitleSetMessage = builder.buildUnchecked();
         Assertions.assertThat(customerTitleSetMessage).isInstanceOf(CustomerTitleSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerTitleSetMessage.builder().title("title") } };
+        return new Object[][] { new Object[] { "title", CustomerTitleSetMessage.builder().title("title") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddedMessagePayloadTest.java
index 10ea71c1989..db3f35a8527 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryAddedMessagePayloadBuilder builder) {
         DeliveryAddedMessagePayload deliveryAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(deliveryAddedMessagePayload).isInstanceOf(DeliveryAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DeliveryAddedMessagePayload.builder()
-                        .delivery(new com.commercetools.api.models.order.DeliveryImpl()) },
-                new Object[] { DeliveryAddedMessagePayload.builder().shippingKey("shippingKey") } };
+                new Object[] { "delivery",
+                        DeliveryAddedMessagePayload.builder()
+                                .delivery(new com.commercetools.api.models.order.DeliveryImpl()) },
+                new Object[] { "shippingKey", DeliveryAddedMessagePayload.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddedMessageTest.java
index b0800797d72..e0b1ee30e68 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryAddedMessageBuilder builder) {
         DeliveryAddedMessage deliveryAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(deliveryAddedMessage).isInstanceOf(DeliveryAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DeliveryAddedMessage.builder()
-                        .delivery(new com.commercetools.api.models.order.DeliveryImpl()) },
-                new Object[] { DeliveryAddedMessage.builder().shippingKey("shippingKey") } };
+                new Object[] { "delivery",
+                        DeliveryAddedMessage.builder()
+                                .delivery(new com.commercetools.api.models.order.DeliveryImpl()) },
+                new Object[] { "shippingKey", DeliveryAddedMessage.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddressSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddressSetMessagePayloadTest.java
index 7ac5d9b4f0a..8d17bbc5eeb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddressSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddressSetMessagePayloadTest.java
@@ -1,35 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryAddressSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryAddressSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryAddressSetMessagePayloadBuilder builder) {
         DeliveryAddressSetMessagePayload deliveryAddressSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(deliveryAddressSetMessagePayload).isInstanceOf(DeliveryAddressSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryAddressSetMessagePayload.builder().deliveryId("deliveryId") },
-                new Object[] { DeliveryAddressSetMessagePayload.builder()
-                        .address(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { DeliveryAddressSetMessagePayload.builder()
-                        .oldAddress(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { DeliveryAddressSetMessagePayload.builder().shippingKey("shippingKey") } };
+        return new Object[][] {
+                new Object[] { "deliveryId", DeliveryAddressSetMessagePayload.builder().deliveryId("deliveryId") },
+                new Object[] { "address",
+                        DeliveryAddressSetMessagePayload.builder()
+                                .address(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "oldAddress",
+                        DeliveryAddressSetMessagePayload.builder()
+                                .oldAddress(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "shippingKey", DeliveryAddressSetMessagePayload.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddressSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddressSetMessageTest.java
index 8cad00cade9..6e8eda5bd21 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddressSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryAddressSetMessageTest.java
@@ -1,35 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryAddressSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryAddressSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryAddressSetMessageBuilder builder) {
         DeliveryAddressSetMessage deliveryAddressSetMessage = builder.buildUnchecked();
         Assertions.assertThat(deliveryAddressSetMessage).isInstanceOf(DeliveryAddressSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryAddressSetMessage.builder().deliveryId("deliveryId") },
-                new Object[] { DeliveryAddressSetMessage.builder()
-                        .address(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { DeliveryAddressSetMessage.builder()
-                        .oldAddress(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { DeliveryAddressSetMessage.builder().shippingKey("shippingKey") } };
+        return new Object[][] {
+                new Object[] { "deliveryId", DeliveryAddressSetMessage.builder().deliveryId("deliveryId") },
+                new Object[] { "address",
+                        DeliveryAddressSetMessage.builder()
+                                .address(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "oldAddress",
+                        DeliveryAddressSetMessage.builder()
+                                .oldAddress(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "shippingKey", DeliveryAddressSetMessage.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldAddedMessagePayloadTest.java
index 553954f52e8..2cc24f442c9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldAddedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryCustomFieldAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryCustomFieldAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryCustomFieldAddedMessagePayloadBuilder builder) {
         DeliveryCustomFieldAddedMessagePayload deliveryCustomFieldAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(deliveryCustomFieldAddedMessagePayload)
                 .isInstanceOf(DeliveryCustomFieldAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryCustomFieldAddedMessagePayload.builder().name("name") },
-                new Object[] { DeliveryCustomFieldAddedMessagePayload.builder().value("value") },
-                new Object[] { DeliveryCustomFieldAddedMessagePayload.builder().deliveryId("deliveryId") } };
+        return new Object[][] { new Object[] { "name", DeliveryCustomFieldAddedMessagePayload.builder().name("name") },
+                new Object[] { "value", DeliveryCustomFieldAddedMessagePayload.builder().value("value") },
+                new Object[] { "deliveryId",
+                        DeliveryCustomFieldAddedMessagePayload.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldAddedMessageTest.java
index 2fc72cc28e2..4fbd78ef4ac 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldAddedMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryCustomFieldAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryCustomFieldAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryCustomFieldAddedMessageBuilder builder) {
         DeliveryCustomFieldAddedMessage deliveryCustomFieldAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(deliveryCustomFieldAddedMessage).isInstanceOf(DeliveryCustomFieldAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryCustomFieldAddedMessage.builder().name("name") },
-                new Object[] { DeliveryCustomFieldAddedMessage.builder().value("value") },
-                new Object[] { DeliveryCustomFieldAddedMessage.builder().deliveryId("deliveryId") } };
+        return new Object[][] { new Object[] { "name", DeliveryCustomFieldAddedMessage.builder().name("name") },
+                new Object[] { "value", DeliveryCustomFieldAddedMessage.builder().value("value") },
+                new Object[] { "deliveryId", DeliveryCustomFieldAddedMessage.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldChangedMessagePayloadTest.java
index 49abf6ad532..4244926ff11 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldChangedMessagePayloadTest.java
@@ -1,34 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryCustomFieldChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryCustomFieldChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryCustomFieldChangedMessagePayloadBuilder builder) {
         DeliveryCustomFieldChangedMessagePayload deliveryCustomFieldChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(deliveryCustomFieldChangedMessagePayload)
                 .isInstanceOf(DeliveryCustomFieldChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryCustomFieldChangedMessagePayload.builder().name("name") },
-                new Object[] { DeliveryCustomFieldChangedMessagePayload.builder().value("value") },
-                new Object[] { DeliveryCustomFieldChangedMessagePayload.builder().previousValue("previousValue") },
-                new Object[] { DeliveryCustomFieldChangedMessagePayload.builder().deliveryId("deliveryId") } };
+        return new Object[][] {
+                new Object[] { "name", DeliveryCustomFieldChangedMessagePayload.builder().name("name") },
+                new Object[] { "value", DeliveryCustomFieldChangedMessagePayload.builder().value("value") },
+                new Object[] { "previousValue",
+                        DeliveryCustomFieldChangedMessagePayload.builder().previousValue("previousValue") },
+                new Object[] { "deliveryId",
+                        DeliveryCustomFieldChangedMessagePayload.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldChangedMessageTest.java
index 8d9028db221..3d67e90097e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldChangedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryCustomFieldChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryCustomFieldChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryCustomFieldChangedMessageBuilder builder) {
         DeliveryCustomFieldChangedMessage deliveryCustomFieldChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(deliveryCustomFieldChangedMessage).isInstanceOf(DeliveryCustomFieldChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryCustomFieldChangedMessage.builder().name("name") },
-                new Object[] { DeliveryCustomFieldChangedMessage.builder().value("value") },
-                new Object[] { DeliveryCustomFieldChangedMessage.builder().previousValue("previousValue") },
-                new Object[] { DeliveryCustomFieldChangedMessage.builder().deliveryId("deliveryId") } };
+        return new Object[][] { new Object[] { "name", DeliveryCustomFieldChangedMessage.builder().name("name") },
+                new Object[] { "value", DeliveryCustomFieldChangedMessage.builder().value("value") },
+                new Object[] { "previousValue",
+                        DeliveryCustomFieldChangedMessage.builder().previousValue("previousValue") },
+                new Object[] { "deliveryId", DeliveryCustomFieldChangedMessage.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldRemovedMessagePayloadTest.java
index 55f407efc1e..11b40cfa3b5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldRemovedMessagePayloadTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryCustomFieldRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryCustomFieldRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryCustomFieldRemovedMessagePayloadBuilder builder) {
         DeliveryCustomFieldRemovedMessagePayload deliveryCustomFieldRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(deliveryCustomFieldRemovedMessagePayload)
                 .isInstanceOf(DeliveryCustomFieldRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryCustomFieldRemovedMessagePayload.builder().name("name") },
-                new Object[] { DeliveryCustomFieldRemovedMessagePayload.builder().deliveryId("deliveryId") } };
+        return new Object[][] {
+                new Object[] { "name", DeliveryCustomFieldRemovedMessagePayload.builder().name("name") }, new Object[] {
+                        "deliveryId", DeliveryCustomFieldRemovedMessagePayload.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldRemovedMessageTest.java
index 5da85d139e7..45083a71c93 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomFieldRemovedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryCustomFieldRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryCustomFieldRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryCustomFieldRemovedMessageBuilder builder) {
         DeliveryCustomFieldRemovedMessage deliveryCustomFieldRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(deliveryCustomFieldRemovedMessage).isInstanceOf(DeliveryCustomFieldRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryCustomFieldRemovedMessage.builder().name("name") },
-                new Object[] { DeliveryCustomFieldRemovedMessage.builder().deliveryId("deliveryId") } };
+        return new Object[][] { new Object[] { "name", DeliveryCustomFieldRemovedMessage.builder().name("name") },
+                new Object[] { "deliveryId", DeliveryCustomFieldRemovedMessage.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeRemovedMessagePayloadTest.java
index dbdbcfda4d5..866a5dfbfa3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeRemovedMessagePayloadTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryCustomTypeRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryCustomTypeRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryCustomTypeRemovedMessagePayloadBuilder builder) {
         DeliveryCustomTypeRemovedMessagePayload deliveryCustomTypeRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(deliveryCustomTypeRemovedMessagePayload)
                 .isInstanceOf(DeliveryCustomTypeRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DeliveryCustomTypeRemovedMessagePayload.builder().previousTypeId("previousTypeId") },
-                new Object[] { DeliveryCustomTypeRemovedMessagePayload.builder().deliveryId("deliveryId") } };
+                new Object[] { "previousTypeId",
+                        DeliveryCustomTypeRemovedMessagePayload.builder().previousTypeId("previousTypeId") },
+                new Object[] { "deliveryId",
+                        DeliveryCustomTypeRemovedMessagePayload.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeRemovedMessageTest.java
index cb5a97b04fe..5b71b0b98d7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeRemovedMessageTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryCustomTypeRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryCustomTypeRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryCustomTypeRemovedMessageBuilder builder) {
         DeliveryCustomTypeRemovedMessage deliveryCustomTypeRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(deliveryCustomTypeRemovedMessage).isInstanceOf(DeliveryCustomTypeRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DeliveryCustomTypeRemovedMessage.builder().previousTypeId("previousTypeId") },
-                new Object[] { DeliveryCustomTypeRemovedMessage.builder().deliveryId("deliveryId") } };
+                new Object[] { "previousTypeId",
+                        DeliveryCustomTypeRemovedMessage.builder().previousTypeId("previousTypeId") },
+                new Object[] { "deliveryId", DeliveryCustomTypeRemovedMessage.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeSetMessagePayloadTest.java
index 2a52e90183f..e04e9ab9df2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeSetMessagePayloadTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryCustomTypeSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryCustomTypeSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryCustomTypeSetMessagePayloadBuilder builder) {
         DeliveryCustomTypeSetMessagePayload deliveryCustomTypeSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(deliveryCustomTypeSetMessagePayload)
                 .isInstanceOf(DeliveryCustomTypeSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DeliveryCustomTypeSetMessagePayload.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { DeliveryCustomTypeSetMessagePayload.builder().previousTypeId("previousTypeId") },
-                new Object[] { DeliveryCustomTypeSetMessagePayload.builder().deliveryId("deliveryId") } };
+                new Object[] { "customFields",
+                        DeliveryCustomTypeSetMessagePayload.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "previousTypeId",
+                        DeliveryCustomTypeSetMessagePayload.builder().previousTypeId("previousTypeId") },
+                new Object[] { "deliveryId", DeliveryCustomTypeSetMessagePayload.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeSetMessageTest.java
index 0b753531ded..2d43665afdd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryCustomTypeSetMessageTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryCustomTypeSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryCustomTypeSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryCustomTypeSetMessageBuilder builder) {
         DeliveryCustomTypeSetMessage deliveryCustomTypeSetMessage = builder.buildUnchecked();
         Assertions.assertThat(deliveryCustomTypeSetMessage).isInstanceOf(DeliveryCustomTypeSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DeliveryCustomTypeSetMessage.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { DeliveryCustomTypeSetMessage.builder().previousTypeId("previousTypeId") },
-                new Object[] { DeliveryCustomTypeSetMessage.builder().deliveryId("deliveryId") } };
+                new Object[] { "customFields",
+                        DeliveryCustomTypeSetMessage.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "previousTypeId",
+                        DeliveryCustomTypeSetMessage.builder().previousTypeId("previousTypeId") },
+                new Object[] { "deliveryId", DeliveryCustomTypeSetMessage.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryItemsUpdatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryItemsUpdatedMessagePayloadTest.java
index e733b68e131..f8d7c66a129 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryItemsUpdatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryItemsUpdatedMessagePayloadTest.java
@@ -3,38 +3,34 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryItemsUpdatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryItemsUpdatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryItemsUpdatedMessagePayloadBuilder builder) {
         DeliveryItemsUpdatedMessagePayload deliveryItemsUpdatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(deliveryItemsUpdatedMessagePayload)
                 .isInstanceOf(DeliveryItemsUpdatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryItemsUpdatedMessagePayload.builder().deliveryId("deliveryId") },
-                new Object[] { DeliveryItemsUpdatedMessagePayload.builder()
-                        .items(Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] {
+        return new Object[][] {
+                new Object[] { "deliveryId", DeliveryItemsUpdatedMessagePayload.builder().deliveryId("deliveryId") },
+                new Object[] { "items",
+                        DeliveryItemsUpdatedMessagePayload.builder()
+                                .items(Collections
+                                        .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
+                new Object[] { "oldItems",
                         DeliveryItemsUpdatedMessagePayload.builder()
                                 .oldItems(Collections
                                         .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] { DeliveryItemsUpdatedMessagePayload.builder().shippingKey("shippingKey") } };
+                new Object[] { "shippingKey",
+                        DeliveryItemsUpdatedMessagePayload.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryItemsUpdatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryItemsUpdatedMessageTest.java
index 3fb579e257d..02281627319 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryItemsUpdatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryItemsUpdatedMessageTest.java
@@ -3,37 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryItemsUpdatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryItemsUpdatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryItemsUpdatedMessageBuilder builder) {
         DeliveryItemsUpdatedMessage deliveryItemsUpdatedMessage = builder.buildUnchecked();
         Assertions.assertThat(deliveryItemsUpdatedMessage).isInstanceOf(DeliveryItemsUpdatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryItemsUpdatedMessage.builder().deliveryId("deliveryId") },
-                new Object[] { DeliveryItemsUpdatedMessage.builder()
-                        .items(Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] {
+        return new Object[][] {
+                new Object[] { "deliveryId", DeliveryItemsUpdatedMessage.builder().deliveryId("deliveryId") },
+                new Object[] { "items",
+                        DeliveryItemsUpdatedMessage.builder()
+                                .items(Collections
+                                        .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
+                new Object[] { "oldItems",
                         DeliveryItemsUpdatedMessage.builder()
                                 .oldItems(Collections
                                         .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] { DeliveryItemsUpdatedMessage.builder().shippingKey("shippingKey") } };
+                new Object[] { "shippingKey", DeliveryItemsUpdatedMessage.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryRemovedMessagePayloadTest.java
index 50cf3197c28..0e82b8a693d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryRemovedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryRemovedMessagePayloadBuilder builder) {
         DeliveryRemovedMessagePayload deliveryRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(deliveryRemovedMessagePayload).isInstanceOf(DeliveryRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DeliveryRemovedMessagePayload.builder()
-                        .delivery(new com.commercetools.api.models.order.DeliveryImpl()) },
-                new Object[] { DeliveryRemovedMessagePayload.builder().shippingKey("shippingKey") } };
+                new Object[] { "delivery",
+                        DeliveryRemovedMessagePayload.builder()
+                                .delivery(new com.commercetools.api.models.order.DeliveryImpl()) },
+                new Object[] { "shippingKey", DeliveryRemovedMessagePayload.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryRemovedMessageTest.java
index 74cff1f784a..ad8bfbb4598 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DeliveryRemovedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryRemovedMessageBuilder builder) {
         DeliveryRemovedMessage deliveryRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(deliveryRemovedMessage).isInstanceOf(DeliveryRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DeliveryRemovedMessage.builder()
-                        .delivery(new com.commercetools.api.models.order.DeliveryImpl()) },
-                new Object[] { DeliveryRemovedMessage.builder().shippingKey("shippingKey") } };
+                new Object[] { "delivery",
+                        DeliveryRemovedMessage.builder()
+                                .delivery(new com.commercetools.api.models.order.DeliveryImpl()) },
+                new Object[] { "shippingKey", DeliveryRemovedMessage.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeCreatedMessagePayloadTest.java
index e09756f92d7..86250ceec64 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeCreatedMessagePayloadBuilder builder) {
         DiscountCodeCreatedMessagePayload discountCodeCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(discountCodeCreatedMessagePayload).isInstanceOf(DiscountCodeCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "discountCode", DiscountCodeCreatedMessagePayload.builder()
                 .discountCode(new com.commercetools.api.models.discount_code.DiscountCodeImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeCreatedMessageTest.java
index 1929d6df361..5516eca9ffd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeCreatedMessageBuilder builder) {
         DiscountCodeCreatedMessage discountCodeCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(discountCodeCreatedMessage).isInstanceOf(DiscountCodeCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeCreatedMessage.builder()
+        return new Object[][] { new Object[] { "discountCode", DiscountCodeCreatedMessage.builder()
                 .discountCode(new com.commercetools.api.models.discount_code.DiscountCodeImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeDeletedMessagePayloadTest.java
index da2a800d4b6..444974e49cb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeDeletedMessagePayloadTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeDeletedMessagePayloadTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeDeletedMessageTest.java
index 7064c757a68..10a95e3eb9a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeDeletedMessageTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeDeletedMessageTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeKeySetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeKeySetMessagePayloadTest.java
index e8acc39fbcc..1e629e30462 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeKeySetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeKeySetMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeKeySetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeKeySetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeKeySetMessagePayloadBuilder builder) {
         DiscountCodeKeySetMessagePayload discountCodeKeySetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(discountCodeKeySetMessagePayload).isInstanceOf(DiscountCodeKeySetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeKeySetMessagePayload.builder().key("key") },
-                new Object[] { DiscountCodeKeySetMessagePayload.builder().oldKey("oldKey") } };
+        return new Object[][] { new Object[] { "key", DiscountCodeKeySetMessagePayload.builder().key("key") },
+                new Object[] { "oldKey", DiscountCodeKeySetMessagePayload.builder().oldKey("oldKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeKeySetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeKeySetMessageTest.java
index 0c84ec513aa..468fd18485a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeKeySetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/DiscountCodeKeySetMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeKeySetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeKeySetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeKeySetMessageBuilder builder) {
         DiscountCodeKeySetMessage discountCodeKeySetMessage = builder.buildUnchecked();
         Assertions.assertThat(discountCodeKeySetMessage).isInstanceOf(DiscountCodeKeySetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeKeySetMessage.builder().key("key") },
-                new Object[] { DiscountCodeKeySetMessage.builder().oldKey("oldKey") } };
+        return new Object[][] { new Object[] { "key", DiscountCodeKeySetMessage.builder().key("key") },
+                new Object[] { "oldKey", DiscountCodeKeySetMessage.builder().oldKey("oldKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryCreatedMessagePayloadTest.java
index e72725d1809..ccbe9b824df 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryCreatedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryCreatedMessagePayloadBuilder builder) {
         InventoryEntryCreatedMessagePayload inventoryEntryCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryCreatedMessagePayload)
                 .isInstanceOf(InventoryEntryCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntryCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "inventoryEntry", InventoryEntryCreatedMessagePayload.builder()
                 .inventoryEntry(new com.commercetools.api.models.inventory.InventoryEntryImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryCreatedMessageTest.java
index 72348a1dea1..ea6351388ff 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryCreatedMessageBuilder builder) {
         InventoryEntryCreatedMessage inventoryEntryCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryCreatedMessage).isInstanceOf(InventoryEntryCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntryCreatedMessage.builder()
+        return new Object[][] { new Object[] { "inventoryEntry", InventoryEntryCreatedMessage.builder()
                 .inventoryEntry(new com.commercetools.api.models.inventory.InventoryEntryImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryDeletedMessagePayloadTest.java
index b81a324e0bf..3598f60492d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryDeletedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryDeletedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryDeletedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryDeletedMessagePayloadBuilder builder) {
         InventoryEntryDeletedMessagePayload inventoryEntryDeletedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryDeletedMessagePayload)
                 .isInstanceOf(InventoryEntryDeletedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntryDeletedMessagePayload.builder().sku("sku") },
-                new Object[] { InventoryEntryDeletedMessagePayload.builder()
+        return new Object[][] { new Object[] { "sku", InventoryEntryDeletedMessagePayload.builder().sku("sku") },
+                new Object[] { "supplyChannel", InventoryEntryDeletedMessagePayload.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryDeletedMessageTest.java
index a2c29283cdc..8ceaa8db23f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryDeletedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryDeletedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryDeletedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryDeletedMessageBuilder builder) {
         InventoryEntryDeletedMessage inventoryEntryDeletedMessage = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryDeletedMessage).isInstanceOf(InventoryEntryDeletedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntryDeletedMessage.builder().sku("sku") },
-                new Object[] { InventoryEntryDeletedMessage.builder()
+        return new Object[][] { new Object[] { "sku", InventoryEntryDeletedMessage.builder().sku("sku") },
+                new Object[] { "supplyChannel", InventoryEntryDeletedMessage.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryQuantitySetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryQuantitySetMessagePayloadTest.java
index 2ef75b55f61..4e920227517 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryQuantitySetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryQuantitySetMessagePayloadTest.java
@@ -1,36 +1,32 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryQuantitySetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryQuantitySetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryQuantitySetMessagePayloadBuilder builder) {
         InventoryEntryQuantitySetMessagePayload inventoryEntryQuantitySetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryQuantitySetMessagePayload)
                 .isInstanceOf(InventoryEntryQuantitySetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { InventoryEntryQuantitySetMessagePayload.builder().oldQuantityOnStock(4L) },
-                new Object[] { InventoryEntryQuantitySetMessagePayload.builder().newQuantityOnStock(2L) },
-                new Object[] { InventoryEntryQuantitySetMessagePayload.builder().oldAvailableQuantity(9L) },
-                new Object[] { InventoryEntryQuantitySetMessagePayload.builder().newAvailableQuantity(8L) },
-                new Object[] { InventoryEntryQuantitySetMessagePayload.builder()
+                new Object[] { "oldQuantityOnStock",
+                        InventoryEntryQuantitySetMessagePayload.builder().oldQuantityOnStock(4L) },
+                new Object[] { "newQuantityOnStock",
+                        InventoryEntryQuantitySetMessagePayload.builder().newQuantityOnStock(2L) },
+                new Object[] { "oldAvailableQuantity",
+                        InventoryEntryQuantitySetMessagePayload.builder().oldAvailableQuantity(9L) },
+                new Object[] { "newAvailableQuantity",
+                        InventoryEntryQuantitySetMessagePayload.builder().newAvailableQuantity(8L) },
+                new Object[] { "supplyChannel", InventoryEntryQuantitySetMessagePayload.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryQuantitySetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryQuantitySetMessageTest.java
index 7210e0cb897..e22bd94653c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryQuantitySetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/InventoryEntryQuantitySetMessageTest.java
@@ -1,34 +1,31 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryEntryQuantitySetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryEntryQuantitySetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryEntryQuantitySetMessageBuilder builder) {
         InventoryEntryQuantitySetMessage inventoryEntryQuantitySetMessage = builder.buildUnchecked();
         Assertions.assertThat(inventoryEntryQuantitySetMessage).isInstanceOf(InventoryEntryQuantitySetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryEntryQuantitySetMessage.builder().oldQuantityOnStock(4L) },
-                new Object[] { InventoryEntryQuantitySetMessage.builder().newQuantityOnStock(2L) },
-                new Object[] { InventoryEntryQuantitySetMessage.builder().oldAvailableQuantity(9L) },
-                new Object[] { InventoryEntryQuantitySetMessage.builder().newAvailableQuantity(8L) },
-                new Object[] { InventoryEntryQuantitySetMessage.builder()
+        return new Object[][] {
+                new Object[] { "oldQuantityOnStock",
+                        InventoryEntryQuantitySetMessage.builder().oldQuantityOnStock(4L) },
+                new Object[] { "newQuantityOnStock",
+                        InventoryEntryQuantitySetMessage.builder().newQuantityOnStock(2L) },
+                new Object[] { "oldAvailableQuantity",
+                        InventoryEntryQuantitySetMessage.builder().oldAvailableQuantity(9L) },
+                new Object[] { "newAvailableQuantity",
+                        InventoryEntryQuantitySetMessage.builder().newAvailableQuantity(8L) },
+                new Object[] { "supplyChannel", InventoryEntryQuantitySetMessage.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/LineItemStateTransitionMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/LineItemStateTransitionMessagePayloadTest.java
index 83ed2aa5d08..18f57461f7d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/LineItemStateTransitionMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/LineItemStateTransitionMessagePayloadTest.java
@@ -3,39 +3,34 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LineItemStateTransitionMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LineItemStateTransitionMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LineItemStateTransitionMessagePayloadBuilder builder) {
         LineItemStateTransitionMessagePayload lineItemStateTransitionMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(lineItemStateTransitionMessagePayload)
                 .isInstanceOf(LineItemStateTransitionMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { LineItemStateTransitionMessagePayload.builder().lineItemId("lineItemId") },
-                new Object[] { LineItemStateTransitionMessagePayload.builder().lineItemKey("lineItemKey") },
-                new Object[] { LineItemStateTransitionMessagePayload.builder()
-                        .transitionDate(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { LineItemStateTransitionMessagePayload.builder().quantity(8L) },
-                new Object[] { LineItemStateTransitionMessagePayload.builder()
-                        .fromState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { LineItemStateTransitionMessagePayload.builder()
+                new Object[] { "lineItemId", LineItemStateTransitionMessagePayload.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        LineItemStateTransitionMessagePayload.builder().lineItemKey("lineItemKey") },
+                new Object[] { "transitionDate",
+                        LineItemStateTransitionMessagePayload.builder()
+                                .transitionDate(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "quantity", LineItemStateTransitionMessagePayload.builder().quantity(8L) },
+                new Object[] { "fromState",
+                        LineItemStateTransitionMessagePayload.builder()
+                                .fromState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "toState", LineItemStateTransitionMessagePayload.builder()
                         .toState(new com.commercetools.api.models.state.StateReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/LineItemStateTransitionMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/LineItemStateTransitionMessageTest.java
index 851849c9792..0529343fa78 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/LineItemStateTransitionMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/LineItemStateTransitionMessageTest.java
@@ -3,37 +3,32 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LineItemStateTransitionMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LineItemStateTransitionMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LineItemStateTransitionMessageBuilder builder) {
         LineItemStateTransitionMessage lineItemStateTransitionMessage = builder.buildUnchecked();
         Assertions.assertThat(lineItemStateTransitionMessage).isInstanceOf(LineItemStateTransitionMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LineItemStateTransitionMessage.builder().lineItemId("lineItemId") },
-                new Object[] { LineItemStateTransitionMessage.builder().lineItemKey("lineItemKey") },
-                new Object[] { LineItemStateTransitionMessage.builder()
-                        .transitionDate(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { LineItemStateTransitionMessage.builder().quantity(8L) },
-                new Object[] { LineItemStateTransitionMessage.builder()
-                        .fromState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { LineItemStateTransitionMessage.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", LineItemStateTransitionMessage.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", LineItemStateTransitionMessage.builder().lineItemKey("lineItemKey") },
+                new Object[] { "transitionDate",
+                        LineItemStateTransitionMessage.builder()
+                                .transitionDate(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "quantity", LineItemStateTransitionMessage.builder().quantity(8L) },
+                new Object[] { "fromState",
+                        LineItemStateTransitionMessage.builder()
+                                .fromState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "toState", LineItemStateTransitionMessage.builder()
                         .toState(new com.commercetools.api.models.state.StateReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/MessagePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/MessagePagedQueryResponseTest.java
index 849fc92b270..f888c4920c4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/MessagePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/MessagePagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MessagePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MessagePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MessagePagedQueryResponseBuilder builder) {
         MessagePagedQueryResponse messagePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(messagePagedQueryResponse).isInstanceOf(MessagePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MessagePagedQueryResponse.builder().limit(7L) },
-                new Object[] { MessagePagedQueryResponse.builder().count(2L) },
-                new Object[] { MessagePagedQueryResponse.builder().total(1L) },
-                new Object[] { MessagePagedQueryResponse.builder().offset(3L) },
-                new Object[] { MessagePagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", MessagePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "count", MessagePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", MessagePagedQueryResponse.builder().total(1L) },
+                new Object[] { "offset", MessagePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "results", MessagePagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.message.MessageImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/MessagesConfigurationDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/MessagesConfigurationDraftTest.java
index af9f4046062..f7c09417eda 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/MessagesConfigurationDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/MessagesConfigurationDraftTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MessagesConfigurationDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MessagesConfigurationDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MessagesConfigurationDraftBuilder builder) {
         MessagesConfigurationDraft messagesConfigurationDraft = builder.buildUnchecked();
         Assertions.assertThat(messagesConfigurationDraft).isInstanceOf(MessagesConfigurationDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MessagesConfigurationDraft.builder().enabled(true) },
-                new Object[] { MessagesConfigurationDraft.builder().deleteDaysAfterCreation(4) } };
+        return new Object[][] { new Object[] { "enabled", MessagesConfigurationDraft.builder().enabled(true) },
+                new Object[] { "deleteDaysAfterCreation",
+                        MessagesConfigurationDraft.builder().deleteDaysAfterCreation(4) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/MessagesConfigurationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/MessagesConfigurationTest.java
index 7dda4f9a5fa..54aa7d2b73a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/MessagesConfigurationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/MessagesConfigurationTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MessagesConfigurationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MessagesConfigurationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MessagesConfigurationBuilder builder) {
         MessagesConfiguration messagesConfiguration = builder.buildUnchecked();
         Assertions.assertThat(messagesConfiguration).isInstanceOf(MessagesConfiguration.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MessagesConfiguration.builder().enabled(true) },
-                new Object[] { MessagesConfiguration.builder().deleteDaysAfterCreation(4) } };
+        return new Object[][] { new Object[] { "enabled", MessagesConfiguration.builder().enabled(true) },
+                new Object[] { "deleteDaysAfterCreation",
+                        MessagesConfiguration.builder().deleteDaysAfterCreation(4) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBillingAddressSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBillingAddressSetMessagePayloadTest.java
index e47d5492c1f..1018caadf41 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBillingAddressSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBillingAddressSetMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderBillingAddressSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderBillingAddressSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderBillingAddressSetMessagePayloadBuilder builder) {
         OrderBillingAddressSetMessagePayload orderBillingAddressSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderBillingAddressSetMessagePayload)
                 .isInstanceOf(OrderBillingAddressSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderBillingAddressSetMessagePayload.builder()
-                        .address(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { OrderBillingAddressSetMessagePayload.builder()
+                new Object[] { "address",
+                        OrderBillingAddressSetMessagePayload.builder()
+                                .address(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "oldAddress", OrderBillingAddressSetMessagePayload.builder()
                         .oldAddress(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBillingAddressSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBillingAddressSetMessageTest.java
index ad5e9794905..c41d8c1ec4a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBillingAddressSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBillingAddressSetMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderBillingAddressSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderBillingAddressSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderBillingAddressSetMessageBuilder builder) {
         OrderBillingAddressSetMessage orderBillingAddressSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderBillingAddressSetMessage).isInstanceOf(OrderBillingAddressSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderBillingAddressSetMessage.builder()
-                        .address(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { OrderBillingAddressSetMessage.builder()
+                new Object[] { "address",
+                        OrderBillingAddressSetMessage.builder()
+                                .address(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "oldAddress", OrderBillingAddressSetMessage.builder()
                         .oldAddress(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBusinessUnitSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBusinessUnitSetMessagePayloadTest.java
index 4a7f28e2cde..9ab956b7cb5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBusinessUnitSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBusinessUnitSetMessagePayloadTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderBusinessUnitSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderBusinessUnitSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderBusinessUnitSetMessagePayloadBuilder builder) {
         OrderBusinessUnitSetMessagePayload orderBusinessUnitSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderBusinessUnitSetMessagePayload)
                 .isInstanceOf(OrderBusinessUnitSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderBusinessUnitSetMessagePayload.builder()
+                new Object[] { "businessUnit", OrderBusinessUnitSetMessagePayload.builder()
                         .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { OrderBusinessUnitSetMessagePayload.builder()
-                        .oldbusinessUnit(
-                            new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
+                new Object[] { "oldbusinessUnit",
+                        OrderBusinessUnitSetMessagePayload.builder()
+                                .oldbusinessUnit(
+                                    new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBusinessUnitSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBusinessUnitSetMessageTest.java
index 4abacc05977..29f2a8a0138 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBusinessUnitSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderBusinessUnitSetMessageTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderBusinessUnitSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderBusinessUnitSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderBusinessUnitSetMessageBuilder builder) {
         OrderBusinessUnitSetMessage orderBusinessUnitSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderBusinessUnitSetMessage).isInstanceOf(OrderBusinessUnitSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderBusinessUnitSetMessage.builder()
+                new Object[] { "businessUnit", OrderBusinessUnitSetMessage.builder()
                         .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { OrderBusinessUnitSetMessage.builder()
-                        .oldbusinessUnit(
-                            new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
+                new Object[] { "oldbusinessUnit",
+                        OrderBusinessUnitSetMessage.builder()
+                                .oldbusinessUnit(
+                                    new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCreatedMessagePayloadTest.java
index 6108b92d27a..0277680dee8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCreatedMessagePayloadBuilder builder) {
         OrderCreatedMessagePayload orderCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderCreatedMessagePayload).isInstanceOf(OrderCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "order",
                 OrderCreatedMessagePayload.builder().order(new com.commercetools.api.models.order.OrderImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCreatedMessageTest.java
index 7b8a1d8561f..79b2897a011 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCreatedMessageBuilder builder) {
         OrderCreatedMessage orderCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCreatedMessage).isInstanceOf(OrderCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "order",
                 OrderCreatedMessage.builder().order(new com.commercetools.api.models.order.OrderImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldAddedMessagePayloadTest.java
index 5e4271766a1..cf734efcdbe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldAddedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomFieldAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomFieldAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomFieldAddedMessagePayloadBuilder builder) {
         OrderCustomFieldAddedMessagePayload orderCustomFieldAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderCustomFieldAddedMessagePayload)
                 .isInstanceOf(OrderCustomFieldAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderCustomFieldAddedMessagePayload.builder().name("name") },
-                new Object[] { OrderCustomFieldAddedMessagePayload.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", OrderCustomFieldAddedMessagePayload.builder().name("name") },
+                new Object[] { "value", OrderCustomFieldAddedMessagePayload.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldAddedMessageTest.java
index 8417a0165e5..6760f51fc7c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldAddedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomFieldAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomFieldAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomFieldAddedMessageBuilder builder) {
         OrderCustomFieldAddedMessage orderCustomFieldAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCustomFieldAddedMessage).isInstanceOf(OrderCustomFieldAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderCustomFieldAddedMessage.builder().name("name") },
-                new Object[] { OrderCustomFieldAddedMessage.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", OrderCustomFieldAddedMessage.builder().name("name") },
+                new Object[] { "value", OrderCustomFieldAddedMessage.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldChangedMessagePayloadTest.java
index 8c116b77600..6bc2943f714 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldChangedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomFieldChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomFieldChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomFieldChangedMessagePayloadBuilder builder) {
         OrderCustomFieldChangedMessagePayload orderCustomFieldChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderCustomFieldChangedMessagePayload)
                 .isInstanceOf(OrderCustomFieldChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderCustomFieldChangedMessagePayload.builder().name("name") },
-                new Object[] { OrderCustomFieldChangedMessagePayload.builder().value("value") },
-                new Object[] { OrderCustomFieldChangedMessagePayload.builder().previousValue("previousValue") } };
+        return new Object[][] { new Object[] { "name", OrderCustomFieldChangedMessagePayload.builder().name("name") },
+                new Object[] { "value", OrderCustomFieldChangedMessagePayload.builder().value("value") },
+                new Object[] { "previousValue",
+                        OrderCustomFieldChangedMessagePayload.builder().previousValue("previousValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldChangedMessageTest.java
index c70cfa5c31f..352be559bdb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldChangedMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomFieldChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomFieldChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomFieldChangedMessageBuilder builder) {
         OrderCustomFieldChangedMessage orderCustomFieldChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCustomFieldChangedMessage).isInstanceOf(OrderCustomFieldChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderCustomFieldChangedMessage.builder().name("name") },
-                new Object[] { OrderCustomFieldChangedMessage.builder().value("value") },
-                new Object[] { OrderCustomFieldChangedMessage.builder().previousValue("previousValue") } };
+        return new Object[][] { new Object[] { "name", OrderCustomFieldChangedMessage.builder().name("name") },
+                new Object[] { "value", OrderCustomFieldChangedMessage.builder().value("value") }, new Object[] {
+                        "previousValue", OrderCustomFieldChangedMessage.builder().previousValue("previousValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldRemovedMessagePayloadTest.java
index b3df4406b54..01a0014602a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldRemovedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomFieldRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomFieldRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomFieldRemovedMessagePayloadBuilder builder) {
         OrderCustomFieldRemovedMessagePayload orderCustomFieldRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderCustomFieldRemovedMessagePayload)
                 .isInstanceOf(OrderCustomFieldRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderCustomFieldRemovedMessagePayload.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", OrderCustomFieldRemovedMessagePayload.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldRemovedMessageTest.java
index a9911f1aa36..b8d5255a05c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomFieldRemovedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomFieldRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomFieldRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomFieldRemovedMessageBuilder builder) {
         OrderCustomFieldRemovedMessage orderCustomFieldRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCustomFieldRemovedMessage).isInstanceOf(OrderCustomFieldRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderCustomFieldRemovedMessage.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", OrderCustomFieldRemovedMessage.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemAddedMessagePayloadTest.java
index c076fa098fc..717914018b0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemAddedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomLineItemAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomLineItemAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomLineItemAddedMessagePayloadBuilder builder) {
         OrderCustomLineItemAddedMessagePayload orderCustomLineItemAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderCustomLineItemAddedMessagePayload)
                 .isInstanceOf(OrderCustomLineItemAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderCustomLineItemAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "customLineItem", OrderCustomLineItemAddedMessagePayload.builder()
                 .customLineItem(new com.commercetools.api.models.cart.CustomLineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemAddedMessageTest.java
index bbb7a46c208..395e68aafd6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomLineItemAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomLineItemAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomLineItemAddedMessageBuilder builder) {
         OrderCustomLineItemAddedMessage orderCustomLineItemAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCustomLineItemAddedMessage).isInstanceOf(OrderCustomLineItemAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderCustomLineItemAddedMessage.builder()
+        return new Object[][] { new Object[] { "customLineItem", OrderCustomLineItemAddedMessage.builder()
                 .customLineItem(new com.commercetools.api.models.cart.CustomLineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemDiscountSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemDiscountSetMessagePayloadTest.java
index c4c985b39a0..0c4b536ef2b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemDiscountSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemDiscountSetMessagePayloadTest.java
@@ -3,40 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomLineItemDiscountSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomLineItemDiscountSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomLineItemDiscountSetMessagePayloadBuilder builder) {
         OrderCustomLineItemDiscountSetMessagePayload orderCustomLineItemDiscountSetMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(orderCustomLineItemDiscountSetMessagePayload)
                 .isInstanceOf(OrderCustomLineItemDiscountSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         OrderCustomLineItemDiscountSetMessagePayload.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemKey",
                         OrderCustomLineItemDiscountSetMessagePayload.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { OrderCustomLineItemDiscountSetMessagePayload.builder()
-                        .discountedPricePerQuantity(Collections.singletonList(
-                            new com.commercetools.api.models.cart.DiscountedLineItemPriceForQuantityImpl())) },
-                new Object[] { OrderCustomLineItemDiscountSetMessagePayload.builder()
+                new Object[] { "discountedPricePerQuantity",
+                        OrderCustomLineItemDiscountSetMessagePayload.builder()
+                                .discountedPricePerQuantity(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.DiscountedLineItemPriceForQuantityImpl())) },
+                new Object[] { "taxedPrice", OrderCustomLineItemDiscountSetMessagePayload.builder()
                         .taxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemDiscountSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemDiscountSetMessageTest.java
index 995abbf2de7..d50c141e22b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemDiscountSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemDiscountSetMessageTest.java
@@ -3,37 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomLineItemDiscountSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomLineItemDiscountSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomLineItemDiscountSetMessageBuilder builder) {
         OrderCustomLineItemDiscountSetMessage orderCustomLineItemDiscountSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCustomLineItemDiscountSetMessage)
                 .isInstanceOf(OrderCustomLineItemDiscountSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderCustomLineItemDiscountSetMessage.builder().customLineItemId("customLineItemId") },
-                new Object[] { OrderCustomLineItemDiscountSetMessage.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { OrderCustomLineItemDiscountSetMessage.builder()
-                        .discountedPricePerQuantity(Collections.singletonList(
-                            new com.commercetools.api.models.cart.DiscountedLineItemPriceForQuantityImpl())) },
-                new Object[] { OrderCustomLineItemDiscountSetMessage.builder()
+                new Object[] { "customLineItemId",
+                        OrderCustomLineItemDiscountSetMessage.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
+                        OrderCustomLineItemDiscountSetMessage.builder().customLineItemKey("customLineItemKey") },
+                new Object[] { "discountedPricePerQuantity",
+                        OrderCustomLineItemDiscountSetMessage.builder()
+                                .discountedPricePerQuantity(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.DiscountedLineItemPriceForQuantityImpl())) },
+                new Object[] { "taxedPrice", OrderCustomLineItemDiscountSetMessage.builder()
                         .taxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemQuantityChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemQuantityChangedMessagePayloadTest.java
index 55fa1ca9a85..6ea1e9c61d5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemQuantityChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemQuantityChangedMessagePayloadTest.java
@@ -1,38 +1,33 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomLineItemQuantityChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomLineItemQuantityChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomLineItemQuantityChangedMessagePayloadBuilder builder) {
         OrderCustomLineItemQuantityChangedMessagePayload orderCustomLineItemQuantityChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(orderCustomLineItemQuantityChangedMessagePayload)
                 .isInstanceOf(OrderCustomLineItemQuantityChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderCustomLineItemQuantityChangedMessagePayload.builder()
-                        .customLineItemId("customLineItemId") },
-                new Object[] { OrderCustomLineItemQuantityChangedMessagePayload.builder()
-                        .customLineItemKey("customLineItemKey") },
-                new Object[] { OrderCustomLineItemQuantityChangedMessagePayload.builder().quantity(8L) },
-                new Object[] { OrderCustomLineItemQuantityChangedMessagePayload.builder().oldQuantity(2L) } };
+                new Object[] { "customLineItemId",
+                        OrderCustomLineItemQuantityChangedMessagePayload.builder()
+                                .customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
+                        OrderCustomLineItemQuantityChangedMessagePayload.builder()
+                                .customLineItemKey("customLineItemKey") },
+                new Object[] { "quantity", OrderCustomLineItemQuantityChangedMessagePayload.builder().quantity(8L) },
+                new Object[] { "oldQuantity",
+                        OrderCustomLineItemQuantityChangedMessagePayload.builder().oldQuantity(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemQuantityChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemQuantityChangedMessageTest.java
index 310d2c07645..083b407d5ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemQuantityChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemQuantityChangedMessageTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomLineItemQuantityChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomLineItemQuantityChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomLineItemQuantityChangedMessageBuilder builder) {
         OrderCustomLineItemQuantityChangedMessage orderCustomLineItemQuantityChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCustomLineItemQuantityChangedMessage)
                 .isInstanceOf(OrderCustomLineItemQuantityChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         OrderCustomLineItemQuantityChangedMessage.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemKey",
                         OrderCustomLineItemQuantityChangedMessage.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { OrderCustomLineItemQuantityChangedMessage.builder().quantity(8L) },
-                new Object[] { OrderCustomLineItemQuantityChangedMessage.builder().oldQuantity(2L) } };
+                new Object[] { "quantity", OrderCustomLineItemQuantityChangedMessage.builder().quantity(8L) },
+                new Object[] { "oldQuantity", OrderCustomLineItemQuantityChangedMessage.builder().oldQuantity(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemRemovedMessagePayloadTest.java
index 1ba643873d2..ebb960a1a19 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemRemovedMessagePayloadTest.java
@@ -1,36 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomLineItemRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomLineItemRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomLineItemRemovedMessagePayloadBuilder builder) {
         OrderCustomLineItemRemovedMessagePayload orderCustomLineItemRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderCustomLineItemRemovedMessagePayload)
                 .isInstanceOf(OrderCustomLineItemRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         OrderCustomLineItemRemovedMessagePayload.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemKey",
                         OrderCustomLineItemRemovedMessagePayload.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { OrderCustomLineItemRemovedMessagePayload.builder()
+                new Object[] { "customLineItem", OrderCustomLineItemRemovedMessagePayload.builder()
                         .customLineItem(new com.commercetools.api.models.cart.CustomLineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemRemovedMessageTest.java
index 1230b2e8deb..9d6d272c7f8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomLineItemRemovedMessageTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomLineItemRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomLineItemRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomLineItemRemovedMessageBuilder builder) {
         OrderCustomLineItemRemovedMessage orderCustomLineItemRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCustomLineItemRemovedMessage).isInstanceOf(OrderCustomLineItemRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderCustomLineItemRemovedMessage.builder().customLineItemId("customLineItemId") },
-                new Object[] { OrderCustomLineItemRemovedMessage.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { OrderCustomLineItemRemovedMessage.builder()
+                new Object[] { "customLineItemId",
+                        OrderCustomLineItemRemovedMessage.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
+                        OrderCustomLineItemRemovedMessage.builder().customLineItemKey("customLineItemKey") },
+                new Object[] { "customLineItem", OrderCustomLineItemRemovedMessage.builder()
                         .customLineItem(new com.commercetools.api.models.cart.CustomLineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeRemovedMessagePayloadTest.java
index d2a834c8ec1..44efd2b0174 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeRemovedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomTypeRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomTypeRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomTypeRemovedMessagePayloadBuilder builder) {
         OrderCustomTypeRemovedMessagePayload orderCustomTypeRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderCustomTypeRemovedMessagePayload)
                 .isInstanceOf(OrderCustomTypeRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { OrderCustomTypeRemovedMessagePayload.builder().previousTypeId("previousTypeId") } };
+        return new Object[][] { new Object[] { "previousTypeId",
+                OrderCustomTypeRemovedMessagePayload.builder().previousTypeId("previousTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeRemovedMessageTest.java
index ee4e8f09347..6a6762b9011 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeRemovedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomTypeRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomTypeRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomTypeRemovedMessageBuilder builder) {
         OrderCustomTypeRemovedMessage orderCustomTypeRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCustomTypeRemovedMessage).isInstanceOf(OrderCustomTypeRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { OrderCustomTypeRemovedMessage.builder().previousTypeId("previousTypeId") } };
+        return new Object[][] { new Object[] { "previousTypeId",
+                OrderCustomTypeRemovedMessage.builder().previousTypeId("previousTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeSetMessagePayloadTest.java
index f100bfe798f..19d748493ef 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeSetMessagePayloadTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomTypeSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomTypeSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomTypeSetMessagePayloadBuilder builder) {
         OrderCustomTypeSetMessagePayload orderCustomTypeSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderCustomTypeSetMessagePayload).isInstanceOf(OrderCustomTypeSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderCustomTypeSetMessagePayload.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { OrderCustomTypeSetMessagePayload.builder().previousTypeId("previousTypeId") } };
+                new Object[] { "customFields",
+                        OrderCustomTypeSetMessagePayload.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "previousTypeId",
+                        OrderCustomTypeSetMessagePayload.builder().previousTypeId("previousTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeSetMessageTest.java
index d9ca3473887..f16155782a0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomTypeSetMessageTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomTypeSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomTypeSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomTypeSetMessageBuilder builder) {
         OrderCustomTypeSetMessage orderCustomTypeSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCustomTypeSetMessage).isInstanceOf(OrderCustomTypeSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderCustomTypeSetMessage.builder()
-                        .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { OrderCustomTypeSetMessage.builder().previousTypeId("previousTypeId") } };
+                new Object[] { "customFields",
+                        OrderCustomTypeSetMessage.builder()
+                                .customFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "previousTypeId",
+                        OrderCustomTypeSetMessage.builder().previousTypeId("previousTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerEmailSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerEmailSetMessagePayloadTest.java
index 016ae0ad5dd..78164b40f49 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerEmailSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerEmailSetMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomerEmailSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomerEmailSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomerEmailSetMessagePayloadBuilder builder) {
         OrderCustomerEmailSetMessagePayload orderCustomerEmailSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderCustomerEmailSetMessagePayload)
                 .isInstanceOf(OrderCustomerEmailSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderCustomerEmailSetMessagePayload.builder().email("email") },
-                new Object[] { OrderCustomerEmailSetMessagePayload.builder().oldEmail("oldEmail") } };
+        return new Object[][] { new Object[] { "email", OrderCustomerEmailSetMessagePayload.builder().email("email") },
+                new Object[] { "oldEmail", OrderCustomerEmailSetMessagePayload.builder().oldEmail("oldEmail") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerEmailSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerEmailSetMessageTest.java
index 56d8ac7ca27..e4c597dc3ab 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerEmailSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerEmailSetMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomerEmailSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomerEmailSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomerEmailSetMessageBuilder builder) {
         OrderCustomerEmailSetMessage orderCustomerEmailSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCustomerEmailSetMessage).isInstanceOf(OrderCustomerEmailSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderCustomerEmailSetMessage.builder().email("email") },
-                new Object[] { OrderCustomerEmailSetMessage.builder().oldEmail("oldEmail") } };
+        return new Object[][] { new Object[] { "email", OrderCustomerEmailSetMessage.builder().email("email") },
+                new Object[] { "oldEmail", OrderCustomerEmailSetMessage.builder().oldEmail("oldEmail") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerGroupSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerGroupSetMessagePayloadTest.java
index e4f41f02cb3..3d11b515cd7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerGroupSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerGroupSetMessagePayloadTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomerGroupSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomerGroupSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomerGroupSetMessagePayloadBuilder builder) {
         OrderCustomerGroupSetMessagePayload orderCustomerGroupSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderCustomerGroupSetMessagePayload)
                 .isInstanceOf(OrderCustomerGroupSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderCustomerGroupSetMessagePayload.builder()
+                new Object[] { "customerGroup", OrderCustomerGroupSetMessagePayload.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] { OrderCustomerGroupSetMessagePayload.builder()
-                        .oldCustomerGroup(
-                            new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) } };
+                new Object[] { "oldCustomerGroup",
+                        OrderCustomerGroupSetMessagePayload.builder()
+                                .oldCustomerGroup(
+                                    new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerGroupSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerGroupSetMessageTest.java
index 44a4e5ce80e..93c9d31f22e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerGroupSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerGroupSetMessageTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomerGroupSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomerGroupSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomerGroupSetMessageBuilder builder) {
         OrderCustomerGroupSetMessage orderCustomerGroupSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCustomerGroupSetMessage).isInstanceOf(OrderCustomerGroupSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderCustomerGroupSetMessage.builder()
+                new Object[] { "customerGroup", OrderCustomerGroupSetMessage.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] { OrderCustomerGroupSetMessage.builder()
-                        .oldCustomerGroup(
-                            new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) } };
+                new Object[] { "oldCustomerGroup",
+                        OrderCustomerGroupSetMessage.builder()
+                                .oldCustomerGroup(
+                                    new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerSetMessagePayloadTest.java
index 37041376fa9..e6c91c3dd15 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerSetMessagePayloadTest.java
@@ -1,39 +1,34 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomerSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomerSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomerSetMessagePayloadBuilder builder) {
         OrderCustomerSetMessagePayload orderCustomerSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderCustomerSetMessagePayload).isInstanceOf(OrderCustomerSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderCustomerSetMessagePayload.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { OrderCustomerSetMessagePayload.builder()
+                new Object[] { "customer",
+                        OrderCustomerSetMessagePayload.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "customerGroup", OrderCustomerSetMessagePayload.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] { OrderCustomerSetMessagePayload.builder()
-                        .oldCustomer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { OrderCustomerSetMessagePayload.builder()
-                        .oldCustomerGroup(
-                            new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) } };
+                new Object[] { "oldCustomer",
+                        OrderCustomerSetMessagePayload.builder()
+                                .oldCustomer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "oldCustomerGroup",
+                        OrderCustomerSetMessagePayload.builder()
+                                .oldCustomerGroup(
+                                    new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerSetMessageTest.java
index c2ef24b1dab..dc9be40eb1b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderCustomerSetMessageTest.java
@@ -1,39 +1,34 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderCustomerSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderCustomerSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderCustomerSetMessageBuilder builder) {
         OrderCustomerSetMessage orderCustomerSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderCustomerSetMessage).isInstanceOf(OrderCustomerSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderCustomerSetMessage.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { OrderCustomerSetMessage.builder()
+                new Object[] { "customer",
+                        OrderCustomerSetMessage.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "customerGroup", OrderCustomerSetMessage.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] { OrderCustomerSetMessage.builder()
-                        .oldCustomer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { OrderCustomerSetMessage.builder()
-                        .oldCustomerGroup(
-                            new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) } };
+                new Object[] { "oldCustomer",
+                        OrderCustomerSetMessage.builder()
+                                .oldCustomer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "oldCustomerGroup",
+                        OrderCustomerSetMessage.builder()
+                                .oldCustomerGroup(
+                                    new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDeletedMessagePayloadTest.java
index 8bbdb5f12d9..cb0e2a9dfff 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDeletedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderDeletedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderDeletedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderDeletedMessagePayloadBuilder builder) {
         OrderDeletedMessagePayload orderDeletedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderDeletedMessagePayload).isInstanceOf(OrderDeletedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "order",
                 OrderDeletedMessagePayload.builder().order(new com.commercetools.api.models.order.OrderImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDeletedMessageTest.java
index 2614852d08b..44c518001e0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDeletedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderDeletedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderDeletedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderDeletedMessageBuilder builder) {
         OrderDeletedMessage orderDeletedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderDeletedMessage).isInstanceOf(OrderDeletedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "order",
                 OrderDeletedMessage.builder().order(new com.commercetools.api.models.order.OrderImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeAddedMessagePayloadTest.java
index ac06d47b47f..56c497c4bc3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeAddedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderDiscountCodeAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderDiscountCodeAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderDiscountCodeAddedMessagePayloadBuilder builder) {
         OrderDiscountCodeAddedMessagePayload orderDiscountCodeAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderDiscountCodeAddedMessagePayload)
                 .isInstanceOf(OrderDiscountCodeAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderDiscountCodeAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "discountCode", OrderDiscountCodeAddedMessagePayload.builder()
                 .discountCode(new com.commercetools.api.models.discount_code.DiscountCodeReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeAddedMessageTest.java
index d3df7dfdb13..1242b83d96d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderDiscountCodeAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderDiscountCodeAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderDiscountCodeAddedMessageBuilder builder) {
         OrderDiscountCodeAddedMessage orderDiscountCodeAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderDiscountCodeAddedMessage).isInstanceOf(OrderDiscountCodeAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderDiscountCodeAddedMessage.builder()
+        return new Object[][] { new Object[] { "discountCode", OrderDiscountCodeAddedMessage.builder()
                 .discountCode(new com.commercetools.api.models.discount_code.DiscountCodeReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeRemovedMessagePayloadTest.java
index 5b9dd32ccd6..d72e0659422 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeRemovedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderDiscountCodeRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderDiscountCodeRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderDiscountCodeRemovedMessagePayloadBuilder builder) {
         OrderDiscountCodeRemovedMessagePayload orderDiscountCodeRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderDiscountCodeRemovedMessagePayload)
                 .isInstanceOf(OrderDiscountCodeRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderDiscountCodeRemovedMessagePayload.builder()
+        return new Object[][] { new Object[] { "discountCode", OrderDiscountCodeRemovedMessagePayload.builder()
                 .discountCode(new com.commercetools.api.models.discount_code.DiscountCodeReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeRemovedMessageTest.java
index cfb5e0226a8..4f78ccd5916 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeRemovedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderDiscountCodeRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderDiscountCodeRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderDiscountCodeRemovedMessageBuilder builder) {
         OrderDiscountCodeRemovedMessage orderDiscountCodeRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderDiscountCodeRemovedMessage).isInstanceOf(OrderDiscountCodeRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderDiscountCodeRemovedMessage.builder()
+        return new Object[][] { new Object[] { "discountCode", OrderDiscountCodeRemovedMessage.builder()
                 .discountCode(new com.commercetools.api.models.discount_code.DiscountCodeReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeStateSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeStateSetMessagePayloadTest.java
index 24ea5a4d380..796d5449936 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeStateSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeStateSetMessagePayloadTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderDiscountCodeStateSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderDiscountCodeStateSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderDiscountCodeStateSetMessagePayloadBuilder builder) {
         OrderDiscountCodeStateSetMessagePayload orderDiscountCodeStateSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderDiscountCodeStateSetMessagePayload)
                 .isInstanceOf(OrderDiscountCodeStateSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderDiscountCodeStateSetMessagePayload.builder()
+                new Object[] { "discountCode", OrderDiscountCodeStateSetMessagePayload.builder()
                         .discountCode(new com.commercetools.api.models.discount_code.DiscountCodeReferenceImpl()) },
-                new Object[] { OrderDiscountCodeStateSetMessagePayload.builder()
-                        .state(com.commercetools.api.models.cart.DiscountCodeState.findEnum("NotActive")) },
-                new Object[] { OrderDiscountCodeStateSetMessagePayload.builder()
+                new Object[] { "state",
+                        OrderDiscountCodeStateSetMessagePayload.builder()
+                                .state(com.commercetools.api.models.cart.DiscountCodeState.findEnum("NotActive")) },
+                new Object[] { "oldState", OrderDiscountCodeStateSetMessagePayload.builder()
                         .oldState(com.commercetools.api.models.cart.DiscountCodeState.findEnum("NotActive")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeStateSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeStateSetMessageTest.java
index 8307a595136..23792445e5d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeStateSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderDiscountCodeStateSetMessageTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderDiscountCodeStateSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderDiscountCodeStateSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderDiscountCodeStateSetMessageBuilder builder) {
         OrderDiscountCodeStateSetMessage orderDiscountCodeStateSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderDiscountCodeStateSetMessage).isInstanceOf(OrderDiscountCodeStateSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderDiscountCodeStateSetMessage.builder()
+                new Object[] { "discountCode", OrderDiscountCodeStateSetMessage.builder()
                         .discountCode(new com.commercetools.api.models.discount_code.DiscountCodeReferenceImpl()) },
-                new Object[] { OrderDiscountCodeStateSetMessage.builder()
-                        .state(com.commercetools.api.models.cart.DiscountCodeState.findEnum("NotActive")) },
-                new Object[] { OrderDiscountCodeStateSetMessage.builder()
+                new Object[] { "state",
+                        OrderDiscountCodeStateSetMessage.builder()
+                                .state(com.commercetools.api.models.cart.DiscountCodeState.findEnum("NotActive")) },
+                new Object[] { "oldState", OrderDiscountCodeStateSetMessage.builder()
                         .oldState(com.commercetools.api.models.cart.DiscountCodeState.findEnum("NotActive")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderEditAppliedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderEditAppliedMessagePayloadTest.java
index 584fef880a5..7fe5420120a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderEditAppliedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderEditAppliedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditAppliedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditAppliedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditAppliedMessagePayloadBuilder builder) {
         OrderEditAppliedMessagePayload orderEditAppliedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderEditAppliedMessagePayload).isInstanceOf(OrderEditAppliedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderEditAppliedMessagePayload.builder()
-                        .edit(new com.commercetools.api.models.order_edit.OrderEditImpl()) },
-                new Object[] { OrderEditAppliedMessagePayload.builder()
+                new Object[] { "edit",
+                        OrderEditAppliedMessagePayload.builder()
+                                .edit(new com.commercetools.api.models.order_edit.OrderEditImpl()) },
+                new Object[] { "result", OrderEditAppliedMessagePayload.builder()
                         .result(new com.commercetools.api.models.order_edit.OrderEditAppliedImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderEditAppliedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderEditAppliedMessageTest.java
index 1b44a7aa8cf..70010294d9c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderEditAppliedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderEditAppliedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditAppliedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditAppliedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditAppliedMessageBuilder builder) {
         OrderEditAppliedMessage orderEditAppliedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderEditAppliedMessage).isInstanceOf(OrderEditAppliedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderEditAppliedMessage.builder()
-                        .edit(new com.commercetools.api.models.order_edit.OrderEditImpl()) },
-                new Object[] { OrderEditAppliedMessage.builder()
+                new Object[] { "edit",
+                        OrderEditAppliedMessage.builder()
+                                .edit(new com.commercetools.api.models.order_edit.OrderEditImpl()) },
+                new Object[] { "result", OrderEditAppliedMessage.builder()
                         .result(new com.commercetools.api.models.order_edit.OrderEditAppliedImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderImportedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderImportedMessagePayloadTest.java
index cb97722bade..6c95cba2737 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderImportedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderImportedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderImportedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderImportedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderImportedMessagePayloadBuilder builder) {
         OrderImportedMessagePayload orderImportedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderImportedMessagePayload).isInstanceOf(OrderImportedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "order",
                 OrderImportedMessagePayload.builder().order(new com.commercetools.api.models.order.OrderImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderImportedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderImportedMessageTest.java
index b6bd106b95f..8dabe9ef17f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderImportedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderImportedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderImportedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderImportedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderImportedMessageBuilder builder) {
         OrderImportedMessage orderImportedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderImportedMessage).isInstanceOf(OrderImportedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "order",
                 OrderImportedMessage.builder().order(new com.commercetools.api.models.order.OrderImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemAddedMessagePayloadTest.java
index 1f228083ed4..c357e41423c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemAddedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderLineItemAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderLineItemAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderLineItemAddedMessagePayloadBuilder builder) {
         OrderLineItemAddedMessagePayload orderLineItemAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderLineItemAddedMessagePayload).isInstanceOf(OrderLineItemAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderLineItemAddedMessagePayload.builder()
-                        .lineItem(new com.commercetools.api.models.cart.LineItemImpl()) },
-                new Object[] { OrderLineItemAddedMessagePayload.builder().addedQuantity(2L) } };
+                new Object[] { "lineItem",
+                        OrderLineItemAddedMessagePayload.builder()
+                                .lineItem(new com.commercetools.api.models.cart.LineItemImpl()) },
+                new Object[] { "addedQuantity", OrderLineItemAddedMessagePayload.builder().addedQuantity(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemAddedMessageTest.java
index ec461593d53..8b825a0de69 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemAddedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderLineItemAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderLineItemAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderLineItemAddedMessageBuilder builder) {
         OrderLineItemAddedMessage orderLineItemAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderLineItemAddedMessage).isInstanceOf(OrderLineItemAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderLineItemAddedMessage.builder()
-                        .lineItem(new com.commercetools.api.models.cart.LineItemImpl()) },
-                new Object[] { OrderLineItemAddedMessage.builder().addedQuantity(2L) } };
+                new Object[] { "lineItem",
+                        OrderLineItemAddedMessage.builder()
+                                .lineItem(new com.commercetools.api.models.cart.LineItemImpl()) },
+                new Object[] { "addedQuantity", OrderLineItemAddedMessage.builder().addedQuantity(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDiscountSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDiscountSetMessagePayloadTest.java
index 706a45a37d5..f82fb3762d4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDiscountSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDiscountSetMessagePayloadTest.java
@@ -3,43 +3,41 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderLineItemDiscountSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderLineItemDiscountSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderLineItemDiscountSetMessagePayloadBuilder builder) {
         OrderLineItemDiscountSetMessagePayload orderLineItemDiscountSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderLineItemDiscountSetMessagePayload)
                 .isInstanceOf(OrderLineItemDiscountSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderLineItemDiscountSetMessagePayload.builder().lineItemId("lineItemId") },
-                new Object[] { OrderLineItemDiscountSetMessagePayload.builder().lineItemKey("lineItemKey") },
-                new Object[] { OrderLineItemDiscountSetMessagePayload.builder()
-                        .discountedPricePerQuantity(Collections.singletonList(
-                            new com.commercetools.api.models.cart.DiscountedLineItemPriceForQuantityImpl())) },
-                new Object[] { OrderLineItemDiscountSetMessagePayload.builder()
-                        .totalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { OrderLineItemDiscountSetMessagePayload.builder()
-                        .taxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) },
-                new Object[] { OrderLineItemDiscountSetMessagePayload.builder()
-                        .taxedPricePortions(Collections
-                                .singletonList(new com.commercetools.api.models.cart.MethodTaxedPriceImpl())) } };
+                new Object[] { "lineItemId",
+                        OrderLineItemDiscountSetMessagePayload.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        OrderLineItemDiscountSetMessagePayload.builder().lineItemKey("lineItemKey") },
+                new Object[] { "discountedPricePerQuantity",
+                        OrderLineItemDiscountSetMessagePayload.builder()
+                                .discountedPricePerQuantity(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.DiscountedLineItemPriceForQuantityImpl())) },
+                new Object[] { "totalPrice",
+                        OrderLineItemDiscountSetMessagePayload.builder()
+                                .totalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "taxedPrice",
+                        OrderLineItemDiscountSetMessagePayload.builder()
+                                .taxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) },
+                new Object[] { "taxedPricePortions",
+                        OrderLineItemDiscountSetMessagePayload.builder()
+                                .taxedPricePortions(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.MethodTaxedPriceImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDiscountSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDiscountSetMessageTest.java
index 6689837bd35..bd495b9c095 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDiscountSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDiscountSetMessageTest.java
@@ -3,41 +3,38 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderLineItemDiscountSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderLineItemDiscountSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderLineItemDiscountSetMessageBuilder builder) {
         OrderLineItemDiscountSetMessage orderLineItemDiscountSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderLineItemDiscountSetMessage).isInstanceOf(OrderLineItemDiscountSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderLineItemDiscountSetMessage.builder().lineItemId("lineItemId") },
-                new Object[] { OrderLineItemDiscountSetMessage.builder().lineItemKey("lineItemKey") },
-                new Object[] { OrderLineItemDiscountSetMessage.builder()
-                        .discountedPricePerQuantity(Collections.singletonList(
-                            new com.commercetools.api.models.cart.DiscountedLineItemPriceForQuantityImpl())) },
-                new Object[] { OrderLineItemDiscountSetMessage.builder()
-                        .totalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { OrderLineItemDiscountSetMessage.builder()
-                        .taxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) },
-                new Object[] { OrderLineItemDiscountSetMessage.builder()
-                        .taxedPricePortions(Collections
-                                .singletonList(new com.commercetools.api.models.cart.MethodTaxedPriceImpl())) } };
+        return new Object[][] {
+                new Object[] { "lineItemId", OrderLineItemDiscountSetMessage.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", OrderLineItemDiscountSetMessage.builder().lineItemKey("lineItemKey") },
+                new Object[] { "discountedPricePerQuantity",
+                        OrderLineItemDiscountSetMessage.builder()
+                                .discountedPricePerQuantity(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.DiscountedLineItemPriceForQuantityImpl())) },
+                new Object[] { "totalPrice",
+                        OrderLineItemDiscountSetMessage.builder()
+                                .totalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "taxedPrice",
+                        OrderLineItemDiscountSetMessage.builder()
+                                .taxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) },
+                new Object[] { "taxedPricePortions",
+                        OrderLineItemDiscountSetMessage.builder()
+                                .taxedPricePortions(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.MethodTaxedPriceImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDistributionChannelSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDistributionChannelSetMessagePayloadTest.java
index ff92ae4afed..bff24241cdc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDistributionChannelSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDistributionChannelSetMessagePayloadTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderLineItemDistributionChannelSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderLineItemDistributionChannelSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderLineItemDistributionChannelSetMessagePayloadBuilder builder) {
         OrderLineItemDistributionChannelSetMessagePayload orderLineItemDistributionChannelSetMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(orderLineItemDistributionChannelSetMessagePayload)
                 .isInstanceOf(OrderLineItemDistributionChannelSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderLineItemDistributionChannelSetMessagePayload.builder().lineItemId("lineItemId") },
-                new Object[] { OrderLineItemDistributionChannelSetMessagePayload.builder().lineItemKey("lineItemKey") },
-                new Object[] { OrderLineItemDistributionChannelSetMessagePayload.builder()
+                new Object[] { "lineItemId",
+                        OrderLineItemDistributionChannelSetMessagePayload.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        OrderLineItemDistributionChannelSetMessagePayload.builder().lineItemKey("lineItemKey") },
+                new Object[] { "distributionChannel", OrderLineItemDistributionChannelSetMessagePayload.builder()
                         .distributionChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDistributionChannelSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDistributionChannelSetMessageTest.java
index 64010927fd8..9523c927147 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDistributionChannelSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemDistributionChannelSetMessageTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderLineItemDistributionChannelSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderLineItemDistributionChannelSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderLineItemDistributionChannelSetMessageBuilder builder) {
         OrderLineItemDistributionChannelSetMessage orderLineItemDistributionChannelSetMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(orderLineItemDistributionChannelSetMessage)
                 .isInstanceOf(OrderLineItemDistributionChannelSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderLineItemDistributionChannelSetMessage.builder().lineItemId("lineItemId") },
-                new Object[] { OrderLineItemDistributionChannelSetMessage.builder().lineItemKey("lineItemKey") },
-                new Object[] { OrderLineItemDistributionChannelSetMessage.builder()
+                new Object[] { "lineItemId",
+                        OrderLineItemDistributionChannelSetMessage.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        OrderLineItemDistributionChannelSetMessage.builder().lineItemKey("lineItemKey") },
+                new Object[] { "distributionChannel", OrderLineItemDistributionChannelSetMessage.builder()
                         .distributionChannel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemRemovedMessagePayloadTest.java
index 9031dd99014..9bcc94af31b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemRemovedMessagePayloadTest.java
@@ -3,43 +3,41 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderLineItemRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderLineItemRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderLineItemRemovedMessagePayloadBuilder builder) {
         OrderLineItemRemovedMessagePayload orderLineItemRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderLineItemRemovedMessagePayload)
                 .isInstanceOf(OrderLineItemRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderLineItemRemovedMessagePayload.builder().lineItemId("lineItemId") },
-                new Object[] { OrderLineItemRemovedMessagePayload.builder().lineItemKey("lineItemKey") },
-                new Object[] { OrderLineItemRemovedMessagePayload.builder().removedQuantity(7L) },
-                new Object[] { OrderLineItemRemovedMessagePayload.builder().newQuantity(4L) },
-                new Object[] { OrderLineItemRemovedMessagePayload.builder()
-                        .newState(Collections.singletonList(new com.commercetools.api.models.order.ItemStateImpl())) },
-                new Object[] { OrderLineItemRemovedMessagePayload.builder()
-                        .newTotalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { OrderLineItemRemovedMessagePayload.builder()
-                        .newTaxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) },
-                new Object[] { OrderLineItemRemovedMessagePayload.builder()
-                        .newPrice(new com.commercetools.api.models.common.PriceImpl()) },
-                new Object[] { OrderLineItemRemovedMessagePayload.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", OrderLineItemRemovedMessagePayload.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", OrderLineItemRemovedMessagePayload.builder().lineItemKey("lineItemKey") },
+                new Object[] { "removedQuantity", OrderLineItemRemovedMessagePayload.builder().removedQuantity(7L) },
+                new Object[] { "newQuantity", OrderLineItemRemovedMessagePayload.builder().newQuantity(4L) },
+                new Object[] { "newState",
+                        OrderLineItemRemovedMessagePayload.builder()
+                                .newState(Collections
+                                        .singletonList(new com.commercetools.api.models.order.ItemStateImpl())) },
+                new Object[] { "newTotalPrice",
+                        OrderLineItemRemovedMessagePayload.builder()
+                                .newTotalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "newTaxedPrice",
+                        OrderLineItemRemovedMessagePayload.builder()
+                                .newTaxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) },
+                new Object[] { "newPrice",
+                        OrderLineItemRemovedMessagePayload.builder()
+                                .newPrice(new com.commercetools.api.models.common.PriceImpl()) },
+                new Object[] { "newShippingDetail", OrderLineItemRemovedMessagePayload.builder()
                         .newShippingDetail(new com.commercetools.api.models.cart.ItemShippingDetailsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemRemovedMessageTest.java
index 0661f3b9c20..74f240cac69 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderLineItemRemovedMessageTest.java
@@ -3,42 +3,40 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderLineItemRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderLineItemRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderLineItemRemovedMessageBuilder builder) {
         OrderLineItemRemovedMessage orderLineItemRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderLineItemRemovedMessage).isInstanceOf(OrderLineItemRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderLineItemRemovedMessage.builder().lineItemId("lineItemId") },
-                new Object[] { OrderLineItemRemovedMessage.builder().lineItemKey("lineItemKey") },
-                new Object[] { OrderLineItemRemovedMessage.builder().removedQuantity(7L) },
-                new Object[] { OrderLineItemRemovedMessage.builder().newQuantity(4L) },
-                new Object[] { OrderLineItemRemovedMessage.builder()
-                        .newState(Collections.singletonList(new com.commercetools.api.models.order.ItemStateImpl())) },
-                new Object[] { OrderLineItemRemovedMessage.builder()
-                        .newTotalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { OrderLineItemRemovedMessage.builder()
-                        .newTaxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) },
-                new Object[] { OrderLineItemRemovedMessage.builder()
-                        .newPrice(new com.commercetools.api.models.common.PriceImpl()) },
-                new Object[] { OrderLineItemRemovedMessage.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", OrderLineItemRemovedMessage.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", OrderLineItemRemovedMessage.builder().lineItemKey("lineItemKey") },
+                new Object[] { "removedQuantity", OrderLineItemRemovedMessage.builder().removedQuantity(7L) },
+                new Object[] { "newQuantity", OrderLineItemRemovedMessage.builder().newQuantity(4L) },
+                new Object[] { "newState",
+                        OrderLineItemRemovedMessage.builder()
+                                .newState(Collections
+                                        .singletonList(new com.commercetools.api.models.order.ItemStateImpl())) },
+                new Object[] { "newTotalPrice",
+                        OrderLineItemRemovedMessage.builder()
+                                .newTotalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "newTaxedPrice",
+                        OrderLineItemRemovedMessage.builder()
+                                .newTaxedPrice(new com.commercetools.api.models.cart.TaxedItemPriceImpl()) },
+                new Object[] { "newPrice",
+                        OrderLineItemRemovedMessage.builder()
+                                .newPrice(new com.commercetools.api.models.common.PriceImpl()) },
+                new Object[] { "newShippingDetail", OrderLineItemRemovedMessage.builder()
                         .newShippingDetail(new com.commercetools.api.models.cart.ItemShippingDetailsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentAddedMessagePayloadTest.java
index 2adb3cfd9c4..6dec286d603 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentAddedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderPaymentAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderPaymentAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderPaymentAddedMessagePayloadBuilder builder) {
         OrderPaymentAddedMessagePayload orderPaymentAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderPaymentAddedMessagePayload).isInstanceOf(OrderPaymentAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderPaymentAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "payment", OrderPaymentAddedMessagePayload.builder()
                 .payment(new com.commercetools.api.models.payment.PaymentReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentAddedMessageTest.java
index 33db7b24eb7..3563fa3febd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderPaymentAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderPaymentAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderPaymentAddedMessageBuilder builder) {
         OrderPaymentAddedMessage orderPaymentAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderPaymentAddedMessage).isInstanceOf(OrderPaymentAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderPaymentAddedMessage.builder()
+        return new Object[][] { new Object[] { "payment", OrderPaymentAddedMessage.builder()
                 .payment(new com.commercetools.api.models.payment.PaymentReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentStateChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentStateChangedMessagePayloadTest.java
index b334dde91a6..7b00118423f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentStateChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentStateChangedMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderPaymentStateChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderPaymentStateChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderPaymentStateChangedMessagePayloadBuilder builder) {
         OrderPaymentStateChangedMessagePayload orderPaymentStateChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderPaymentStateChangedMessagePayload)
                 .isInstanceOf(OrderPaymentStateChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderPaymentStateChangedMessagePayload.builder()
-                        .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) },
-                new Object[] { OrderPaymentStateChangedMessagePayload.builder()
+                new Object[] { "paymentState",
+                        OrderPaymentStateChangedMessagePayload.builder()
+                                .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) },
+                new Object[] { "oldPaymentState", OrderPaymentStateChangedMessagePayload.builder()
                         .oldPaymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentStateChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentStateChangedMessageTest.java
index ea43be7faa1..952f2d8075e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentStateChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPaymentStateChangedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderPaymentStateChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderPaymentStateChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderPaymentStateChangedMessageBuilder builder) {
         OrderPaymentStateChangedMessage orderPaymentStateChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderPaymentStateChangedMessage).isInstanceOf(OrderPaymentStateChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderPaymentStateChangedMessage.builder()
-                        .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) },
-                new Object[] { OrderPaymentStateChangedMessage.builder()
+                new Object[] { "paymentState",
+                        OrderPaymentStateChangedMessage.builder()
+                                .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) },
+                new Object[] { "oldPaymentState", OrderPaymentStateChangedMessage.builder()
                         .oldPaymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPurchaseOrderNumberSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPurchaseOrderNumberSetMessagePayloadTest.java
index 6993f864d86..ec008da5bd8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPurchaseOrderNumberSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPurchaseOrderNumberSetMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderPurchaseOrderNumberSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderPurchaseOrderNumberSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderPurchaseOrderNumberSetMessagePayloadBuilder builder) {
         OrderPurchaseOrderNumberSetMessagePayload orderPurchaseOrderNumberSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderPurchaseOrderNumberSetMessagePayload)
                 .isInstanceOf(OrderPurchaseOrderNumberSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderPurchaseOrderNumberSetMessagePayload.builder()
-                        .purchaseOrderNumber("purchaseOrderNumber") },
-                new Object[] { OrderPurchaseOrderNumberSetMessagePayload.builder()
+                new Object[] { "purchaseOrderNumber",
+                        OrderPurchaseOrderNumberSetMessagePayload.builder()
+                                .purchaseOrderNumber("purchaseOrderNumber") },
+                new Object[] { "oldPurchaseOrderNumber", OrderPurchaseOrderNumberSetMessagePayload.builder()
                         .oldPurchaseOrderNumber("oldPurchaseOrderNumber") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPurchaseOrderNumberSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPurchaseOrderNumberSetMessageTest.java
index 154b2e9d3d7..b918d75b6ed 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPurchaseOrderNumberSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderPurchaseOrderNumberSetMessageTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderPurchaseOrderNumberSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderPurchaseOrderNumberSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderPurchaseOrderNumberSetMessageBuilder builder) {
         OrderPurchaseOrderNumberSetMessage orderPurchaseOrderNumberSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderPurchaseOrderNumberSetMessage)
                 .isInstanceOf(OrderPurchaseOrderNumberSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "purchaseOrderNumber",
                         OrderPurchaseOrderNumberSetMessage.builder().purchaseOrderNumber("purchaseOrderNumber") },
-                new Object[] { OrderPurchaseOrderNumberSetMessage.builder()
+                new Object[] { "oldPurchaseOrderNumber", OrderPurchaseOrderNumberSetMessage.builder()
                         .oldPurchaseOrderNumber("oldPurchaseOrderNumber") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderReturnShipmentStateChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderReturnShipmentStateChangedMessagePayloadTest.java
index a308e3f278a..9999c577a46 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderReturnShipmentStateChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderReturnShipmentStateChangedMessagePayloadTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderReturnShipmentStateChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderReturnShipmentStateChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderReturnShipmentStateChangedMessagePayloadBuilder builder) {
         OrderReturnShipmentStateChangedMessagePayload orderReturnShipmentStateChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(orderReturnShipmentStateChangedMessagePayload)
                 .isInstanceOf(OrderReturnShipmentStateChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderReturnShipmentStateChangedMessagePayload.builder().returnItemId("returnItemId") },
-                new Object[] { OrderReturnShipmentStateChangedMessagePayload.builder()
-                        .returnShipmentState(
-                            com.commercetools.api.models.order.ReturnShipmentState.findEnum("Advised")) } };
+                new Object[] { "returnItemId",
+                        OrderReturnShipmentStateChangedMessagePayload.builder().returnItemId("returnItemId") },
+                new Object[] { "returnShipmentState",
+                        OrderReturnShipmentStateChangedMessagePayload.builder()
+                                .returnShipmentState(
+                                    com.commercetools.api.models.order.ReturnShipmentState.findEnum("Advised")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderReturnShipmentStateChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderReturnShipmentStateChangedMessageTest.java
index f99620b97d7..b7c09b15af5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderReturnShipmentStateChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderReturnShipmentStateChangedMessageTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderReturnShipmentStateChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderReturnShipmentStateChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderReturnShipmentStateChangedMessageBuilder builder) {
         OrderReturnShipmentStateChangedMessage orderReturnShipmentStateChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderReturnShipmentStateChangedMessage)
                 .isInstanceOf(OrderReturnShipmentStateChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderReturnShipmentStateChangedMessage.builder().returnItemId("returnItemId") },
-                new Object[] { OrderReturnShipmentStateChangedMessage.builder()
-                        .returnShipmentState(
-                            com.commercetools.api.models.order.ReturnShipmentState.findEnum("Advised")) } };
+                new Object[] { "returnItemId",
+                        OrderReturnShipmentStateChangedMessage.builder().returnItemId("returnItemId") },
+                new Object[] { "returnShipmentState",
+                        OrderReturnShipmentStateChangedMessage.builder()
+                                .returnShipmentState(
+                                    com.commercetools.api.models.order.ReturnShipmentState.findEnum("Advised")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShipmentStateChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShipmentStateChangedMessagePayloadTest.java
index 1ed4f289f7f..a83c88db3b2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShipmentStateChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShipmentStateChangedMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderShipmentStateChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderShipmentStateChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderShipmentStateChangedMessagePayloadBuilder builder) {
         OrderShipmentStateChangedMessagePayload orderShipmentStateChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderShipmentStateChangedMessagePayload)
                 .isInstanceOf(OrderShipmentStateChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderShipmentStateChangedMessagePayload.builder()
-                        .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) },
-                new Object[] { OrderShipmentStateChangedMessagePayload.builder()
+                new Object[] { "shipmentState",
+                        OrderShipmentStateChangedMessagePayload.builder()
+                                .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) },
+                new Object[] { "oldShipmentState", OrderShipmentStateChangedMessagePayload.builder()
                         .oldShipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShipmentStateChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShipmentStateChangedMessageTest.java
index aaf4d2b664d..8c3503739c2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShipmentStateChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShipmentStateChangedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderShipmentStateChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderShipmentStateChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderShipmentStateChangedMessageBuilder builder) {
         OrderShipmentStateChangedMessage orderShipmentStateChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderShipmentStateChangedMessage).isInstanceOf(OrderShipmentStateChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderShipmentStateChangedMessage.builder()
-                        .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) },
-                new Object[] { OrderShipmentStateChangedMessage.builder()
+                new Object[] { "shipmentState",
+                        OrderShipmentStateChangedMessage.builder()
+                                .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) },
+                new Object[] { "oldShipmentState", OrderShipmentStateChangedMessage.builder()
                         .oldShipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingAddressSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingAddressSetMessagePayloadTest.java
index 7a5d3fdde75..fb085580ae3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingAddressSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingAddressSetMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderShippingAddressSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderShippingAddressSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderShippingAddressSetMessagePayloadBuilder builder) {
         OrderShippingAddressSetMessagePayload orderShippingAddressSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderShippingAddressSetMessagePayload)
                 .isInstanceOf(OrderShippingAddressSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderShippingAddressSetMessagePayload.builder()
-                        .address(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { OrderShippingAddressSetMessagePayload.builder()
+                new Object[] { "address",
+                        OrderShippingAddressSetMessagePayload.builder()
+                                .address(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "oldAddress", OrderShippingAddressSetMessagePayload.builder()
                         .oldAddress(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingAddressSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingAddressSetMessageTest.java
index 9778d3bc2f2..aa10e534daf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingAddressSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingAddressSetMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderShippingAddressSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderShippingAddressSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderShippingAddressSetMessageBuilder builder) {
         OrderShippingAddressSetMessage orderShippingAddressSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderShippingAddressSetMessage).isInstanceOf(OrderShippingAddressSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderShippingAddressSetMessage.builder()
-                        .address(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { OrderShippingAddressSetMessage.builder()
+                new Object[] { "address",
+                        OrderShippingAddressSetMessage.builder()
+                                .address(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "oldAddress", OrderShippingAddressSetMessage.builder()
                         .oldAddress(new com.commercetools.api.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingInfoSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingInfoSetMessagePayloadTest.java
index 9f3cc34aacf..2dee498705b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingInfoSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingInfoSetMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderShippingInfoSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderShippingInfoSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderShippingInfoSetMessagePayloadBuilder builder) {
         OrderShippingInfoSetMessagePayload orderShippingInfoSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderShippingInfoSetMessagePayload)
                 .isInstanceOf(OrderShippingInfoSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderShippingInfoSetMessagePayload.builder()
-                        .shippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) },
-                new Object[] { OrderShippingInfoSetMessagePayload.builder()
+                new Object[] { "shippingInfo",
+                        OrderShippingInfoSetMessagePayload.builder()
+                                .shippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) },
+                new Object[] { "oldShippingInfo", OrderShippingInfoSetMessagePayload.builder()
                         .oldShippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingInfoSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingInfoSetMessageTest.java
index 748317db4f0..2f44599796f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingInfoSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingInfoSetMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderShippingInfoSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderShippingInfoSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderShippingInfoSetMessageBuilder builder) {
         OrderShippingInfoSetMessage orderShippingInfoSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderShippingInfoSetMessage).isInstanceOf(OrderShippingInfoSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderShippingInfoSetMessage.builder()
-                        .shippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) },
-                new Object[] { OrderShippingInfoSetMessage.builder()
+                new Object[] { "shippingInfo",
+                        OrderShippingInfoSetMessage.builder()
+                                .shippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) },
+                new Object[] { "oldShippingInfo", OrderShippingInfoSetMessage.builder()
                         .oldShippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingRateInputSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingRateInputSetMessagePayloadTest.java
index ce7b4a87baf..647b1a0088c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingRateInputSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingRateInputSetMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderShippingRateInputSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderShippingRateInputSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderShippingRateInputSetMessagePayloadBuilder builder) {
         OrderShippingRateInputSetMessagePayload orderShippingRateInputSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderShippingRateInputSetMessagePayload)
                 .isInstanceOf(OrderShippingRateInputSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderShippingRateInputSetMessagePayload.builder()
-                        .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
-                new Object[] { OrderShippingRateInputSetMessagePayload.builder()
+                new Object[] { "shippingRateInput",
+                        OrderShippingRateInputSetMessagePayload.builder()
+                                .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
+                new Object[] { "oldShippingRateInput", OrderShippingRateInputSetMessagePayload.builder()
                         .oldShippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingRateInputSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingRateInputSetMessageTest.java
index 19007db39ca..f324d6d0dbb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingRateInputSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderShippingRateInputSetMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderShippingRateInputSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderShippingRateInputSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderShippingRateInputSetMessageBuilder builder) {
         OrderShippingRateInputSetMessage orderShippingRateInputSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderShippingRateInputSetMessage).isInstanceOf(OrderShippingRateInputSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderShippingRateInputSetMessage.builder()
-                        .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
-                new Object[] { OrderShippingRateInputSetMessage.builder()
+                new Object[] { "shippingRateInput",
+                        OrderShippingRateInputSetMessage.builder()
+                                .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
+                new Object[] { "oldShippingRateInput", OrderShippingRateInputSetMessage.builder()
                         .oldShippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateChangedMessagePayloadTest.java
index 42202ced399..3f7005f5fe0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateChangedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderStateChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderStateChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderStateChangedMessagePayloadBuilder builder) {
         OrderStateChangedMessagePayload orderStateChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderStateChangedMessagePayload).isInstanceOf(OrderStateChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderStateChangedMessagePayload.builder()
-                        .orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) },
-                new Object[] { OrderStateChangedMessagePayload.builder()
+                new Object[] { "orderState",
+                        OrderStateChangedMessagePayload.builder()
+                                .orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) },
+                new Object[] { "oldOrderState", OrderStateChangedMessagePayload.builder()
                         .oldOrderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateChangedMessageTest.java
index 640b3203fa0..50205862ebf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateChangedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderStateChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderStateChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderStateChangedMessageBuilder builder) {
         OrderStateChangedMessage orderStateChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(orderStateChangedMessage).isInstanceOf(OrderStateChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderStateChangedMessage.builder()
-                        .orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) },
-                new Object[] { OrderStateChangedMessage.builder()
+                new Object[] { "orderState",
+                        OrderStateChangedMessage.builder()
+                                .orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) },
+                new Object[] { "oldOrderState", OrderStateChangedMessage.builder()
                         .oldOrderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateTransitionMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateTransitionMessagePayloadTest.java
index 0c94af0cf86..4ce03b607af 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateTransitionMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateTransitionMessagePayloadTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderStateTransitionMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderStateTransitionMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderStateTransitionMessagePayloadBuilder builder) {
         OrderStateTransitionMessagePayload orderStateTransitionMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderStateTransitionMessagePayload)
                 .isInstanceOf(OrderStateTransitionMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderStateTransitionMessagePayload.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { OrderStateTransitionMessagePayload.builder()
-                        .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { OrderStateTransitionMessagePayload.builder().force(true) } };
+                new Object[] { "state",
+                        OrderStateTransitionMessagePayload.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "oldState",
+                        OrderStateTransitionMessagePayload.builder()
+                                .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "force", OrderStateTransitionMessagePayload.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateTransitionMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateTransitionMessageTest.java
index c980a83d9e8..2e02af78dad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateTransitionMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStateTransitionMessageTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderStateTransitionMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderStateTransitionMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderStateTransitionMessageBuilder builder) {
         OrderStateTransitionMessage orderStateTransitionMessage = builder.buildUnchecked();
         Assertions.assertThat(orderStateTransitionMessage).isInstanceOf(OrderStateTransitionMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderStateTransitionMessage.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { OrderStateTransitionMessage.builder()
-                        .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { OrderStateTransitionMessage.builder().force(true) } };
+                new Object[] { "state",
+                        OrderStateTransitionMessage.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "oldState",
+                        OrderStateTransitionMessage.builder()
+                                .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "force", OrderStateTransitionMessage.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStoreSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStoreSetMessagePayloadTest.java
index bd6aa165a0d..1bb88d4f01d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStoreSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStoreSetMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderStoreSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderStoreSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderStoreSetMessagePayloadBuilder builder) {
         OrderStoreSetMessagePayload orderStoreSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(orderStoreSetMessagePayload).isInstanceOf(OrderStoreSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderStoreSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "store", OrderStoreSetMessagePayload.builder()
                 .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStoreSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStoreSetMessageTest.java
index 33b4b02e352..f81780d6eec 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStoreSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/OrderStoreSetMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderStoreSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderStoreSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderStoreSetMessageBuilder builder) {
         OrderStoreSetMessage orderStoreSetMessage = builder.buildUnchecked();
         Assertions.assertThat(orderStoreSetMessage).isInstanceOf(OrderStoreSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderStoreSetMessage.builder()
+        return new Object[][] { new Object[] { "store", OrderStoreSetMessage.builder()
                 .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelAddedToDeliveryMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelAddedToDeliveryMessagePayloadTest.java
index 7d16ccc4e7c..f27d19a067c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelAddedToDeliveryMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelAddedToDeliveryMessagePayloadTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelAddedToDeliveryMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelAddedToDeliveryMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelAddedToDeliveryMessagePayloadBuilder builder) {
         ParcelAddedToDeliveryMessagePayload parcelAddedToDeliveryMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(parcelAddedToDeliveryMessagePayload)
                 .isInstanceOf(ParcelAddedToDeliveryMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ParcelAddedToDeliveryMessagePayload.builder()
-                        .delivery(new com.commercetools.api.models.order.DeliveryImpl()) },
-                new Object[] { ParcelAddedToDeliveryMessagePayload.builder()
-                        .parcel(new com.commercetools.api.models.order.ParcelImpl()) },
-                new Object[] { ParcelAddedToDeliveryMessagePayload.builder().shippingKey("shippingKey") } };
+                new Object[] { "delivery",
+                        ParcelAddedToDeliveryMessagePayload.builder()
+                                .delivery(new com.commercetools.api.models.order.DeliveryImpl()) },
+                new Object[] { "parcel",
+                        ParcelAddedToDeliveryMessagePayload.builder()
+                                .parcel(new com.commercetools.api.models.order.ParcelImpl()) },
+                new Object[] { "shippingKey",
+                        ParcelAddedToDeliveryMessagePayload.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelAddedToDeliveryMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelAddedToDeliveryMessageTest.java
index 3a30dbd6c91..2e12aa5ed44 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelAddedToDeliveryMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelAddedToDeliveryMessageTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelAddedToDeliveryMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelAddedToDeliveryMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelAddedToDeliveryMessageBuilder builder) {
         ParcelAddedToDeliveryMessage parcelAddedToDeliveryMessage = builder.buildUnchecked();
         Assertions.assertThat(parcelAddedToDeliveryMessage).isInstanceOf(ParcelAddedToDeliveryMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ParcelAddedToDeliveryMessage.builder()
-                        .delivery(new com.commercetools.api.models.order.DeliveryImpl()) },
-                new Object[] { ParcelAddedToDeliveryMessage.builder()
-                        .parcel(new com.commercetools.api.models.order.ParcelImpl()) },
-                new Object[] { ParcelAddedToDeliveryMessage.builder().shippingKey("shippingKey") } };
+                new Object[] { "delivery",
+                        ParcelAddedToDeliveryMessage.builder()
+                                .delivery(new com.commercetools.api.models.order.DeliveryImpl()) },
+                new Object[] { "parcel",
+                        ParcelAddedToDeliveryMessage.builder()
+                                .parcel(new com.commercetools.api.models.order.ParcelImpl()) },
+                new Object[] { "shippingKey", ParcelAddedToDeliveryMessage.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelItemsUpdatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelItemsUpdatedMessagePayloadTest.java
index 2430f7f6ab2..ce3ebe5c5ac 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelItemsUpdatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelItemsUpdatedMessagePayloadTest.java
@@ -3,38 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelItemsUpdatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelItemsUpdatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelItemsUpdatedMessagePayloadBuilder builder) {
         ParcelItemsUpdatedMessagePayload parcelItemsUpdatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(parcelItemsUpdatedMessagePayload).isInstanceOf(ParcelItemsUpdatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelItemsUpdatedMessagePayload.builder().parcelId("parcelId") },
-                new Object[] { ParcelItemsUpdatedMessagePayload.builder().deliveryId("deliveryId") },
-                new Object[] { ParcelItemsUpdatedMessagePayload.builder()
-                        .items(Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] {
+        return new Object[][] {
+                new Object[] { "parcelId", ParcelItemsUpdatedMessagePayload.builder().parcelId("parcelId") },
+                new Object[] { "deliveryId", ParcelItemsUpdatedMessagePayload.builder().deliveryId("deliveryId") },
+                new Object[] { "items",
+                        ParcelItemsUpdatedMessagePayload.builder()
+                                .items(Collections
+                                        .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
+                new Object[] { "oldItems",
                         ParcelItemsUpdatedMessagePayload.builder()
                                 .oldItems(Collections
                                         .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] { ParcelItemsUpdatedMessagePayload.builder().shippingKey("shippingKey") } };
+                new Object[] { "shippingKey", ParcelItemsUpdatedMessagePayload.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelItemsUpdatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelItemsUpdatedMessageTest.java
index 1fa90693f66..a5d5c894ec3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelItemsUpdatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelItemsUpdatedMessageTest.java
@@ -3,38 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelItemsUpdatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelItemsUpdatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelItemsUpdatedMessageBuilder builder) {
         ParcelItemsUpdatedMessage parcelItemsUpdatedMessage = builder.buildUnchecked();
         Assertions.assertThat(parcelItemsUpdatedMessage).isInstanceOf(ParcelItemsUpdatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelItemsUpdatedMessage.builder().parcelId("parcelId") },
-                new Object[] { ParcelItemsUpdatedMessage.builder().deliveryId("deliveryId") },
-                new Object[] { ParcelItemsUpdatedMessage.builder()
-                        .items(Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] {
+        return new Object[][] { new Object[] { "parcelId", ParcelItemsUpdatedMessage.builder().parcelId("parcelId") },
+                new Object[] { "deliveryId", ParcelItemsUpdatedMessage.builder().deliveryId("deliveryId") },
+                new Object[] { "items",
+                        ParcelItemsUpdatedMessage.builder()
+                                .items(Collections
+                                        .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
+                new Object[] { "oldItems",
                         ParcelItemsUpdatedMessage.builder()
                                 .oldItems(Collections
                                         .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] { ParcelItemsUpdatedMessage.builder().shippingKey("shippingKey") } };
+                new Object[] { "shippingKey", ParcelItemsUpdatedMessage.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelMeasurementsUpdatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelMeasurementsUpdatedMessagePayloadTest.java
index 5e130c19079..0da95e42e89 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelMeasurementsUpdatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelMeasurementsUpdatedMessagePayloadTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelMeasurementsUpdatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelMeasurementsUpdatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelMeasurementsUpdatedMessagePayloadBuilder builder) {
         ParcelMeasurementsUpdatedMessagePayload parcelMeasurementsUpdatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(parcelMeasurementsUpdatedMessagePayload)
                 .isInstanceOf(ParcelMeasurementsUpdatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ParcelMeasurementsUpdatedMessagePayload.builder().deliveryId("deliveryId") },
-                new Object[] { ParcelMeasurementsUpdatedMessagePayload.builder().parcelId("parcelId") },
-                new Object[] { ParcelMeasurementsUpdatedMessagePayload.builder()
-                        .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) },
-                new Object[] { ParcelMeasurementsUpdatedMessagePayload.builder().shippingKey("shippingKey") } };
+                new Object[] { "deliveryId",
+                        ParcelMeasurementsUpdatedMessagePayload.builder().deliveryId("deliveryId") },
+                new Object[] { "parcelId", ParcelMeasurementsUpdatedMessagePayload.builder().parcelId("parcelId") },
+                new Object[] { "measurements",
+                        ParcelMeasurementsUpdatedMessagePayload.builder()
+                                .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) },
+                new Object[] { "shippingKey",
+                        ParcelMeasurementsUpdatedMessagePayload.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelMeasurementsUpdatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelMeasurementsUpdatedMessageTest.java
index e447de0235b..7b13a16ccb1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelMeasurementsUpdatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelMeasurementsUpdatedMessageTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelMeasurementsUpdatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelMeasurementsUpdatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelMeasurementsUpdatedMessageBuilder builder) {
         ParcelMeasurementsUpdatedMessage parcelMeasurementsUpdatedMessage = builder.buildUnchecked();
         Assertions.assertThat(parcelMeasurementsUpdatedMessage).isInstanceOf(ParcelMeasurementsUpdatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelMeasurementsUpdatedMessage.builder().deliveryId("deliveryId") },
-                new Object[] { ParcelMeasurementsUpdatedMessage.builder().parcelId("parcelId") },
-                new Object[] { ParcelMeasurementsUpdatedMessage.builder()
-                        .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) },
-                new Object[] { ParcelMeasurementsUpdatedMessage.builder().shippingKey("shippingKey") } };
+        return new Object[][] {
+                new Object[] { "deliveryId", ParcelMeasurementsUpdatedMessage.builder().deliveryId("deliveryId") },
+                new Object[] { "parcelId", ParcelMeasurementsUpdatedMessage.builder().parcelId("parcelId") },
+                new Object[] { "measurements",
+                        ParcelMeasurementsUpdatedMessage.builder()
+                                .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) },
+                new Object[] { "shippingKey", ParcelMeasurementsUpdatedMessage.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelRemovedFromDeliveryMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelRemovedFromDeliveryMessagePayloadTest.java
index d19027446d1..8835d1961dd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelRemovedFromDeliveryMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelRemovedFromDeliveryMessagePayloadTest.java
@@ -1,35 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelRemovedFromDeliveryMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelRemovedFromDeliveryMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelRemovedFromDeliveryMessagePayloadBuilder builder) {
         ParcelRemovedFromDeliveryMessagePayload parcelRemovedFromDeliveryMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(parcelRemovedFromDeliveryMessagePayload)
                 .isInstanceOf(ParcelRemovedFromDeliveryMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ParcelRemovedFromDeliveryMessagePayload.builder().deliveryId("deliveryId") },
-                new Object[] { ParcelRemovedFromDeliveryMessagePayload.builder()
-                        .parcel(new com.commercetools.api.models.order.ParcelImpl()) },
-                new Object[] { ParcelRemovedFromDeliveryMessagePayload.builder().shippingKey("shippingKey") } };
+                new Object[] { "deliveryId",
+                        ParcelRemovedFromDeliveryMessagePayload.builder().deliveryId("deliveryId") },
+                new Object[] { "parcel",
+                        ParcelRemovedFromDeliveryMessagePayload.builder()
+                                .parcel(new com.commercetools.api.models.order.ParcelImpl()) },
+                new Object[] { "shippingKey",
+                        ParcelRemovedFromDeliveryMessagePayload.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelRemovedFromDeliveryMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelRemovedFromDeliveryMessageTest.java
index 87c76769185..b57388b3039 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelRemovedFromDeliveryMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelRemovedFromDeliveryMessageTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelRemovedFromDeliveryMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelRemovedFromDeliveryMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelRemovedFromDeliveryMessageBuilder builder) {
         ParcelRemovedFromDeliveryMessage parcelRemovedFromDeliveryMessage = builder.buildUnchecked();
         Assertions.assertThat(parcelRemovedFromDeliveryMessage).isInstanceOf(ParcelRemovedFromDeliveryMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelRemovedFromDeliveryMessage.builder().deliveryId("deliveryId") },
-                new Object[] { ParcelRemovedFromDeliveryMessage.builder()
-                        .parcel(new com.commercetools.api.models.order.ParcelImpl()) },
-                new Object[] { ParcelRemovedFromDeliveryMessage.builder().shippingKey("shippingKey") } };
+        return new Object[][] {
+                new Object[] { "deliveryId", ParcelRemovedFromDeliveryMessage.builder().deliveryId("deliveryId") },
+                new Object[] { "parcel",
+                        ParcelRemovedFromDeliveryMessage.builder()
+                                .parcel(new com.commercetools.api.models.order.ParcelImpl()) },
+                new Object[] { "shippingKey", ParcelRemovedFromDeliveryMessage.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelTrackingDataUpdatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelTrackingDataUpdatedMessagePayloadTest.java
index 6b29e9d844b..1b9c7481d22 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelTrackingDataUpdatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelTrackingDataUpdatedMessagePayloadTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelTrackingDataUpdatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelTrackingDataUpdatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelTrackingDataUpdatedMessagePayloadBuilder builder) {
         ParcelTrackingDataUpdatedMessagePayload parcelTrackingDataUpdatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(parcelTrackingDataUpdatedMessagePayload)
                 .isInstanceOf(ParcelTrackingDataUpdatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ParcelTrackingDataUpdatedMessagePayload.builder().deliveryId("deliveryId") },
-                new Object[] { ParcelTrackingDataUpdatedMessagePayload.builder().parcelId("parcelId") },
-                new Object[] { ParcelTrackingDataUpdatedMessagePayload.builder()
-                        .trackingData(new com.commercetools.api.models.order.TrackingDataImpl()) },
-                new Object[] { ParcelTrackingDataUpdatedMessagePayload.builder().shippingKey("shippingKey") } };
+                new Object[] { "deliveryId",
+                        ParcelTrackingDataUpdatedMessagePayload.builder().deliveryId("deliveryId") },
+                new Object[] { "parcelId", ParcelTrackingDataUpdatedMessagePayload.builder().parcelId("parcelId") },
+                new Object[] { "trackingData",
+                        ParcelTrackingDataUpdatedMessagePayload.builder()
+                                .trackingData(new com.commercetools.api.models.order.TrackingDataImpl()) },
+                new Object[] { "shippingKey",
+                        ParcelTrackingDataUpdatedMessagePayload.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelTrackingDataUpdatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelTrackingDataUpdatedMessageTest.java
index d20a42f8b85..c270c160482 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelTrackingDataUpdatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ParcelTrackingDataUpdatedMessageTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelTrackingDataUpdatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelTrackingDataUpdatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelTrackingDataUpdatedMessageBuilder builder) {
         ParcelTrackingDataUpdatedMessage parcelTrackingDataUpdatedMessage = builder.buildUnchecked();
         Assertions.assertThat(parcelTrackingDataUpdatedMessage).isInstanceOf(ParcelTrackingDataUpdatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelTrackingDataUpdatedMessage.builder().deliveryId("deliveryId") },
-                new Object[] { ParcelTrackingDataUpdatedMessage.builder().parcelId("parcelId") },
-                new Object[] { ParcelTrackingDataUpdatedMessage.builder()
-                        .trackingData(new com.commercetools.api.models.order.TrackingDataImpl()) },
-                new Object[] { ParcelTrackingDataUpdatedMessage.builder().shippingKey("shippingKey") } };
+        return new Object[][] {
+                new Object[] { "deliveryId", ParcelTrackingDataUpdatedMessage.builder().deliveryId("deliveryId") },
+                new Object[] { "parcelId", ParcelTrackingDataUpdatedMessage.builder().parcelId("parcelId") },
+                new Object[] { "trackingData",
+                        ParcelTrackingDataUpdatedMessage.builder()
+                                .trackingData(new com.commercetools.api.models.order.TrackingDataImpl()) },
+                new Object[] { "shippingKey", ParcelTrackingDataUpdatedMessage.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentCreatedMessagePayloadTest.java
index 9720ac0d910..2f05c231518 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentCreatedMessagePayloadBuilder builder) {
         PaymentCreatedMessagePayload paymentCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(paymentCreatedMessagePayload).isInstanceOf(PaymentCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "payment", PaymentCreatedMessagePayload.builder()
                 .payment(new com.commercetools.api.models.payment.PaymentImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentCreatedMessageTest.java
index 12770c3c90a..e72bb4d0809 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentCreatedMessageBuilder builder) {
         PaymentCreatedMessage paymentCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(paymentCreatedMessage).isInstanceOf(PaymentCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "payment",
                 PaymentCreatedMessage.builder().payment(new com.commercetools.api.models.payment.PaymentImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentInteractionAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentInteractionAddedMessagePayloadTest.java
index ac69b33b6ac..da1ecbc28ae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentInteractionAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentInteractionAddedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentInteractionAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentInteractionAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentInteractionAddedMessagePayloadBuilder builder) {
         PaymentInteractionAddedMessagePayload paymentInteractionAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(paymentInteractionAddedMessagePayload)
                 .isInstanceOf(PaymentInteractionAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentInteractionAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "interaction", PaymentInteractionAddedMessagePayload.builder()
                 .interaction(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentInteractionAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentInteractionAddedMessageTest.java
index fa2bfcc11d9..61dc459dae4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentInteractionAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentInteractionAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentInteractionAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentInteractionAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentInteractionAddedMessageBuilder builder) {
         PaymentInteractionAddedMessage paymentInteractionAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(paymentInteractionAddedMessage).isInstanceOf(PaymentInteractionAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentInteractionAddedMessage.builder()
+        return new Object[][] { new Object[] { "interaction", PaymentInteractionAddedMessage.builder()
                 .interaction(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusInterfaceCodeSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusInterfaceCodeSetMessagePayloadTest.java
index 46fe150dca2..21d8ea09c2d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusInterfaceCodeSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusInterfaceCodeSetMessagePayloadTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentStatusInterfaceCodeSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentStatusInterfaceCodeSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentStatusInterfaceCodeSetMessagePayloadBuilder builder) {
         PaymentStatusInterfaceCodeSetMessagePayload paymentStatusInterfaceCodeSetMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(paymentStatusInterfaceCodeSetMessagePayload)
                 .isInstanceOf(PaymentStatusInterfaceCodeSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { PaymentStatusInterfaceCodeSetMessagePayload.builder().interfaceCode("interfaceCode") } };
+        return new Object[][] { new Object[] { "interfaceCode",
+                PaymentStatusInterfaceCodeSetMessagePayload.builder().interfaceCode("interfaceCode") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusInterfaceCodeSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusInterfaceCodeSetMessageTest.java
index 3f9afb86b6c..960dab5113a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusInterfaceCodeSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusInterfaceCodeSetMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentStatusInterfaceCodeSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentStatusInterfaceCodeSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentStatusInterfaceCodeSetMessageBuilder builder) {
         PaymentStatusInterfaceCodeSetMessage paymentStatusInterfaceCodeSetMessage = builder.buildUnchecked();
         Assertions.assertThat(paymentStatusInterfaceCodeSetMessage)
                 .isInstanceOf(PaymentStatusInterfaceCodeSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { PaymentStatusInterfaceCodeSetMessage.builder().interfaceCode("interfaceCode") } };
+        return new Object[][] { new Object[] { "interfaceCode",
+                PaymentStatusInterfaceCodeSetMessage.builder().interfaceCode("interfaceCode") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusStateTransitionMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusStateTransitionMessagePayloadTest.java
index c026a51daa2..e0c84f0fc21 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusStateTransitionMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusStateTransitionMessagePayloadTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentStatusStateTransitionMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentStatusStateTransitionMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentStatusStateTransitionMessagePayloadBuilder builder) {
         PaymentStatusStateTransitionMessagePayload paymentStatusStateTransitionMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(paymentStatusStateTransitionMessagePayload)
                 .isInstanceOf(PaymentStatusStateTransitionMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentStatusStateTransitionMessagePayload.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { PaymentStatusStateTransitionMessagePayload.builder().force(true) } };
+                new Object[] { "state",
+                        PaymentStatusStateTransitionMessagePayload.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "force", PaymentStatusStateTransitionMessagePayload.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusStateTransitionMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusStateTransitionMessageTest.java
index 22d01a164ad..2e104c14ad9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusStateTransitionMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentStatusStateTransitionMessageTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentStatusStateTransitionMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentStatusStateTransitionMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentStatusStateTransitionMessageBuilder builder) {
         PaymentStatusStateTransitionMessage paymentStatusStateTransitionMessage = builder.buildUnchecked();
         Assertions.assertThat(paymentStatusStateTransitionMessage)
                 .isInstanceOf(PaymentStatusStateTransitionMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentStatusStateTransitionMessage.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { PaymentStatusStateTransitionMessage.builder().force(true) } };
+                new Object[] { "state",
+                        PaymentStatusStateTransitionMessage.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "force", PaymentStatusStateTransitionMessage.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionAddedMessagePayloadTest.java
index 119ef2a90d0..760b27607ac 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionAddedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentTransactionAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentTransactionAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentTransactionAddedMessagePayloadBuilder builder) {
         PaymentTransactionAddedMessagePayload paymentTransactionAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(paymentTransactionAddedMessagePayload)
                 .isInstanceOf(PaymentTransactionAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentTransactionAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "transaction", PaymentTransactionAddedMessagePayload.builder()
                 .transaction(new com.commercetools.api.models.payment.TransactionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionAddedMessageTest.java
index 1d94630479e..5daf4d7d5e1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentTransactionAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentTransactionAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentTransactionAddedMessageBuilder builder) {
         PaymentTransactionAddedMessage paymentTransactionAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(paymentTransactionAddedMessage).isInstanceOf(PaymentTransactionAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentTransactionAddedMessage.builder()
+        return new Object[][] { new Object[] { "transaction", PaymentTransactionAddedMessage.builder()
                 .transaction(new com.commercetools.api.models.payment.TransactionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionStateChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionStateChangedMessagePayloadTest.java
index e676aeb2d2b..36f961baa86 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionStateChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionStateChangedMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentTransactionStateChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentTransactionStateChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentTransactionStateChangedMessagePayloadBuilder builder) {
         PaymentTransactionStateChangedMessagePayload paymentTransactionStateChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(paymentTransactionStateChangedMessagePayload)
                 .isInstanceOf(PaymentTransactionStateChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentTransactionStateChangedMessagePayload.builder().transactionId("transactionId") },
-                new Object[] { PaymentTransactionStateChangedMessagePayload.builder()
+                new Object[] { "transactionId",
+                        PaymentTransactionStateChangedMessagePayload.builder().transactionId("transactionId") },
+                new Object[] { "state", PaymentTransactionStateChangedMessagePayload.builder()
                         .state(com.commercetools.api.models.payment.TransactionState.findEnum("Initial")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionStateChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionStateChangedMessageTest.java
index 3392ff42891..5108d6766f6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionStateChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/PaymentTransactionStateChangedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentTransactionStateChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentTransactionStateChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentTransactionStateChangedMessageBuilder builder) {
         PaymentTransactionStateChangedMessage paymentTransactionStateChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(paymentTransactionStateChangedMessage)
                 .isInstanceOf(PaymentTransactionStateChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentTransactionStateChangedMessage.builder().transactionId("transactionId") },
-                new Object[] { PaymentTransactionStateChangedMessage.builder()
+                new Object[] { "transactionId",
+                        PaymentTransactionStateChangedMessage.builder().transactionId("transactionId") },
+                new Object[] { "state", PaymentTransactionStateChangedMessage.builder()
                         .state(com.commercetools.api.models.payment.TransactionState.findEnum("Initial")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductAddedToCategoryMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductAddedToCategoryMessagePayloadTest.java
index 8b108c81500..34f783ced94 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductAddedToCategoryMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductAddedToCategoryMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductAddedToCategoryMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductAddedToCategoryMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductAddedToCategoryMessagePayloadBuilder builder) {
         ProductAddedToCategoryMessagePayload productAddedToCategoryMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productAddedToCategoryMessagePayload)
                 .isInstanceOf(ProductAddedToCategoryMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductAddedToCategoryMessagePayload.builder()
-                        .category(new com.commercetools.api.models.category.CategoryReferenceImpl()) },
-                new Object[] { ProductAddedToCategoryMessagePayload.builder().staged(true) } };
+                new Object[] { "category",
+                        ProductAddedToCategoryMessagePayload.builder()
+                                .category(new com.commercetools.api.models.category.CategoryReferenceImpl()) },
+                new Object[] { "staged", ProductAddedToCategoryMessagePayload.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductAddedToCategoryMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductAddedToCategoryMessageTest.java
index a5d072a9508..9a68915408a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductAddedToCategoryMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductAddedToCategoryMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductAddedToCategoryMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductAddedToCategoryMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductAddedToCategoryMessageBuilder builder) {
         ProductAddedToCategoryMessage productAddedToCategoryMessage = builder.buildUnchecked();
         Assertions.assertThat(productAddedToCategoryMessage).isInstanceOf(ProductAddedToCategoryMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductAddedToCategoryMessage.builder()
-                        .category(new com.commercetools.api.models.category.CategoryReferenceImpl()) },
-                new Object[] { ProductAddedToCategoryMessage.builder().staged(true) } };
+                new Object[] { "category",
+                        ProductAddedToCategoryMessage.builder()
+                                .category(new com.commercetools.api.models.category.CategoryReferenceImpl()) },
+                new Object[] { "staged", ProductAddedToCategoryMessage.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductCreatedMessagePayloadTest.java
index 0ad0b2f2716..ff08dd48613 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductCreatedMessagePayloadBuilder builder) {
         ProductCreatedMessagePayload productCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productCreatedMessagePayload).isInstanceOf(ProductCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "productProjection", ProductCreatedMessagePayload.builder()
                 .productProjection(new com.commercetools.api.models.product.ProductProjectionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductCreatedMessageTest.java
index cee3a5b9d0a..53a3b38b753 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductCreatedMessageBuilder builder) {
         ProductCreatedMessage productCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(productCreatedMessage).isInstanceOf(ProductCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductCreatedMessage.builder()
+        return new Object[][] { new Object[] { "productProjection", ProductCreatedMessage.builder()
                 .productProjection(new com.commercetools.api.models.product.ProductProjectionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductDeletedMessagePayloadTest.java
index 42008643f0b..7f2eb07da31 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductDeletedMessagePayloadTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDeletedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDeletedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDeletedMessagePayloadBuilder builder) {
         ProductDeletedMessagePayload productDeletedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productDeletedMessagePayload).isInstanceOf(ProductDeletedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductDeletedMessagePayload.builder()
-                        .removedImageUrls(Collections.singletonList("removedImageUrls")) },
-                new Object[] { ProductDeletedMessagePayload.builder()
+                new Object[] { "removedImageUrls",
+                        ProductDeletedMessagePayload.builder()
+                                .removedImageUrls(Collections.singletonList("removedImageUrls")) },
+                new Object[] { "currentProjection", ProductDeletedMessagePayload.builder()
                         .currentProjection(new com.commercetools.api.models.product.ProductProjectionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductDeletedMessageTest.java
index 0e2160292b1..faccb3248fd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductDeletedMessageTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDeletedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDeletedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDeletedMessageBuilder builder) {
         ProductDeletedMessage productDeletedMessage = builder.buildUnchecked();
         Assertions.assertThat(productDeletedMessage).isInstanceOf(ProductDeletedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductDeletedMessage.builder()
-                        .removedImageUrls(Collections.singletonList("removedImageUrls")) },
-                new Object[] { ProductDeletedMessage.builder()
+                new Object[] { "removedImageUrls",
+                        ProductDeletedMessage.builder()
+                                .removedImageUrls(Collections.singletonList("removedImageUrls")) },
+                new Object[] { "currentProjection", ProductDeletedMessage.builder()
                         .currentProjection(new com.commercetools.api.models.product.ProductProjectionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductImageAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductImageAddedMessagePayloadTest.java
index d9bdd5f32e7..804e102febe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductImageAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductImageAddedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductImageAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductImageAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductImageAddedMessagePayloadBuilder builder) {
         ProductImageAddedMessagePayload productImageAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productImageAddedMessagePayload).isInstanceOf(ProductImageAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductImageAddedMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductImageAddedMessagePayload.builder()
-                        .image(new com.commercetools.api.models.common.ImageImpl()) },
-                new Object[] { ProductImageAddedMessagePayload.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductImageAddedMessagePayload.builder().variantId(5L) },
+                new Object[] { "image",
+                        ProductImageAddedMessagePayload.builder()
+                                .image(new com.commercetools.api.models.common.ImageImpl()) },
+                new Object[] { "staged", ProductImageAddedMessagePayload.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductImageAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductImageAddedMessageTest.java
index 8125d95f46a..964a6fc484f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductImageAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductImageAddedMessageTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductImageAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductImageAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductImageAddedMessageBuilder builder) {
         ProductImageAddedMessage productImageAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(productImageAddedMessage).isInstanceOf(ProductImageAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductImageAddedMessage.builder().variantId(5L) },
-                new Object[] {
+        return new Object[][] { new Object[] { "variantId", ProductImageAddedMessage.builder().variantId(5L) },
+                new Object[] { "image",
                         ProductImageAddedMessage.builder().image(new com.commercetools.api.models.common.ImageImpl()) },
-                new Object[] { ProductImageAddedMessage.builder().staged(true) } };
+                new Object[] { "staged", ProductImageAddedMessage.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceAddedMessagePayloadTest.java
index f71a29ac04b..f1e2de7a844 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceAddedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceAddedMessagePayloadBuilder builder) {
         ProductPriceAddedMessagePayload productPriceAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productPriceAddedMessagePayload).isInstanceOf(ProductPriceAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceAddedMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductPriceAddedMessagePayload.builder()
-                        .price(new com.commercetools.api.models.common.PriceImpl()) },
-                new Object[] { ProductPriceAddedMessagePayload.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductPriceAddedMessagePayload.builder().variantId(5L) },
+                new Object[] { "price",
+                        ProductPriceAddedMessagePayload.builder()
+                                .price(new com.commercetools.api.models.common.PriceImpl()) },
+                new Object[] { "staged", ProductPriceAddedMessagePayload.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceAddedMessageTest.java
index 00e3853898d..54a52b637e2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceAddedMessageTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceAddedMessageBuilder builder) {
         ProductPriceAddedMessage productPriceAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(productPriceAddedMessage).isInstanceOf(ProductPriceAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceAddedMessage.builder().variantId(5L) },
-                new Object[] {
+        return new Object[][] { new Object[] { "variantId", ProductPriceAddedMessage.builder().variantId(5L) },
+                new Object[] { "price",
                         ProductPriceAddedMessage.builder().price(new com.commercetools.api.models.common.PriceImpl()) },
-                new Object[] { ProductPriceAddedMessage.builder().staged(true) } };
+                new Object[] { "staged", ProductPriceAddedMessage.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceChangedMessagePayloadTest.java
index 60d570d3ed7..14580b1a5fd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceChangedMessagePayloadTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceChangedMessagePayloadBuilder builder) {
         ProductPriceChangedMessagePayload productPriceChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productPriceChangedMessagePayload).isInstanceOf(ProductPriceChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceChangedMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductPriceChangedMessagePayload.builder()
-                        .oldPrice(new com.commercetools.api.models.common.PriceImpl()) },
-                new Object[] { ProductPriceChangedMessagePayload.builder()
-                        .newPrice(new com.commercetools.api.models.common.PriceImpl()) },
-                new Object[] { ProductPriceChangedMessagePayload.builder().staged(true) },
-                new Object[] { ProductPriceChangedMessagePayload.builder()
+        return new Object[][] { new Object[] { "variantId", ProductPriceChangedMessagePayload.builder().variantId(5L) },
+                new Object[] { "oldPrice",
+                        ProductPriceChangedMessagePayload.builder()
+                                .oldPrice(new com.commercetools.api.models.common.PriceImpl()) },
+                new Object[] { "newPrice",
+                        ProductPriceChangedMessagePayload.builder()
+                                .newPrice(new com.commercetools.api.models.common.PriceImpl()) },
+                new Object[] { "staged", ProductPriceChangedMessagePayload.builder().staged(true) },
+                new Object[] { "oldStagedPrice", ProductPriceChangedMessagePayload.builder()
                         .oldStagedPrice(new com.commercetools.api.models.common.PriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceChangedMessageTest.java
index 53ba5d9d07a..99a751df3fd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceChangedMessageTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceChangedMessageBuilder builder) {
         ProductPriceChangedMessage productPriceChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(productPriceChangedMessage).isInstanceOf(ProductPriceChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceChangedMessage.builder().variantId(5L) },
-                new Object[] { ProductPriceChangedMessage.builder()
-                        .oldPrice(new com.commercetools.api.models.common.PriceImpl()) },
-                new Object[] { ProductPriceChangedMessage.builder()
-                        .newPrice(new com.commercetools.api.models.common.PriceImpl()) },
-                new Object[] { ProductPriceChangedMessage.builder().staged(true) },
-                new Object[] { ProductPriceChangedMessage.builder()
+        return new Object[][] { new Object[] { "variantId", ProductPriceChangedMessage.builder().variantId(5L) },
+                new Object[] { "oldPrice",
+                        ProductPriceChangedMessage.builder()
+                                .oldPrice(new com.commercetools.api.models.common.PriceImpl()) },
+                new Object[] { "newPrice",
+                        ProductPriceChangedMessage.builder()
+                                .newPrice(new com.commercetools.api.models.common.PriceImpl()) },
+                new Object[] { "staged", ProductPriceChangedMessage.builder().staged(true) },
+                new Object[] { "oldStagedPrice", ProductPriceChangedMessage.builder()
                         .oldStagedPrice(new com.commercetools.api.models.common.PriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldAddedMessagePayloadTest.java
index 5f948bd31e0..44fc5df1ab3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldAddedMessagePayloadTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceCustomFieldAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceCustomFieldAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceCustomFieldAddedMessagePayloadBuilder builder) {
         ProductPriceCustomFieldAddedMessagePayload productPriceCustomFieldAddedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productPriceCustomFieldAddedMessagePayload)
                 .isInstanceOf(ProductPriceCustomFieldAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductPriceCustomFieldAddedMessagePayload.builder().priceId("priceId") },
-                new Object[] { ProductPriceCustomFieldAddedMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductPriceCustomFieldAddedMessagePayload.builder().staged(true) },
-                new Object[] { ProductPriceCustomFieldAddedMessagePayload.builder().name("name") },
-                new Object[] { ProductPriceCustomFieldAddedMessagePayload.builder().value("value") } };
+                new Object[] { "priceId", ProductPriceCustomFieldAddedMessagePayload.builder().priceId("priceId") },
+                new Object[] { "variantId", ProductPriceCustomFieldAddedMessagePayload.builder().variantId(5L) },
+                new Object[] { "staged", ProductPriceCustomFieldAddedMessagePayload.builder().staged(true) },
+                new Object[] { "name", ProductPriceCustomFieldAddedMessagePayload.builder().name("name") },
+                new Object[] { "value", ProductPriceCustomFieldAddedMessagePayload.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldAddedMessageTest.java
index cdb3d12c242..ca1a3aedb7c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldAddedMessageTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceCustomFieldAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceCustomFieldAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceCustomFieldAddedMessageBuilder builder) {
         ProductPriceCustomFieldAddedMessage productPriceCustomFieldAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(productPriceCustomFieldAddedMessage)
                 .isInstanceOf(ProductPriceCustomFieldAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceCustomFieldAddedMessage.builder().priceId("priceId") },
-                new Object[] { ProductPriceCustomFieldAddedMessage.builder().variantId(5L) },
-                new Object[] { ProductPriceCustomFieldAddedMessage.builder().staged(true) },
-                new Object[] { ProductPriceCustomFieldAddedMessage.builder().name("name") },
-                new Object[] { ProductPriceCustomFieldAddedMessage.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "priceId", ProductPriceCustomFieldAddedMessage.builder().priceId("priceId") },
+                new Object[] { "variantId", ProductPriceCustomFieldAddedMessage.builder().variantId(5L) },
+                new Object[] { "staged", ProductPriceCustomFieldAddedMessage.builder().staged(true) },
+                new Object[] { "name", ProductPriceCustomFieldAddedMessage.builder().name("name") },
+                new Object[] { "value", ProductPriceCustomFieldAddedMessage.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldChangedMessagePayloadTest.java
index 446e40aaf29..d541e33457e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldChangedMessagePayloadTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceCustomFieldChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceCustomFieldChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceCustomFieldChangedMessagePayloadBuilder builder) {
         ProductPriceCustomFieldChangedMessagePayload productPriceCustomFieldChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productPriceCustomFieldChangedMessagePayload)
                 .isInstanceOf(ProductPriceCustomFieldChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductPriceCustomFieldChangedMessagePayload.builder().priceId("priceId") },
-                new Object[] { ProductPriceCustomFieldChangedMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductPriceCustomFieldChangedMessagePayload.builder().staged(true) },
-                new Object[] { ProductPriceCustomFieldChangedMessagePayload.builder().name("name") },
-                new Object[] { ProductPriceCustomFieldChangedMessagePayload.builder().value("value") } };
+                new Object[] { "priceId", ProductPriceCustomFieldChangedMessagePayload.builder().priceId("priceId") },
+                new Object[] { "variantId", ProductPriceCustomFieldChangedMessagePayload.builder().variantId(5L) },
+                new Object[] { "staged", ProductPriceCustomFieldChangedMessagePayload.builder().staged(true) },
+                new Object[] { "name", ProductPriceCustomFieldChangedMessagePayload.builder().name("name") },
+                new Object[] { "value", ProductPriceCustomFieldChangedMessagePayload.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldChangedMessageTest.java
index a685115623b..35415f5286d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldChangedMessageTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceCustomFieldChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceCustomFieldChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceCustomFieldChangedMessageBuilder builder) {
         ProductPriceCustomFieldChangedMessage productPriceCustomFieldChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(productPriceCustomFieldChangedMessage)
                 .isInstanceOf(ProductPriceCustomFieldChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceCustomFieldChangedMessage.builder().priceId("priceId") },
-                new Object[] { ProductPriceCustomFieldChangedMessage.builder().variantId(5L) },
-                new Object[] { ProductPriceCustomFieldChangedMessage.builder().staged(true) },
-                new Object[] { ProductPriceCustomFieldChangedMessage.builder().name("name") },
-                new Object[] { ProductPriceCustomFieldChangedMessage.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "priceId", ProductPriceCustomFieldChangedMessage.builder().priceId("priceId") },
+                new Object[] { "variantId", ProductPriceCustomFieldChangedMessage.builder().variantId(5L) },
+                new Object[] { "staged", ProductPriceCustomFieldChangedMessage.builder().staged(true) },
+                new Object[] { "name", ProductPriceCustomFieldChangedMessage.builder().name("name") },
+                new Object[] { "value", ProductPriceCustomFieldChangedMessage.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldRemovedMessagePayloadTest.java
index 3fb9138fba4..82cf4b47a9a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldRemovedMessagePayloadTest.java
@@ -1,36 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceCustomFieldRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceCustomFieldRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceCustomFieldRemovedMessagePayloadBuilder builder) {
         ProductPriceCustomFieldRemovedMessagePayload productPriceCustomFieldRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productPriceCustomFieldRemovedMessagePayload)
                 .isInstanceOf(ProductPriceCustomFieldRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductPriceCustomFieldRemovedMessagePayload.builder().priceId("priceId") },
-                new Object[] { ProductPriceCustomFieldRemovedMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductPriceCustomFieldRemovedMessagePayload.builder().staged(true) },
-                new Object[] { ProductPriceCustomFieldRemovedMessagePayload.builder().name("name") } };
+                new Object[] { "priceId", ProductPriceCustomFieldRemovedMessagePayload.builder().priceId("priceId") },
+                new Object[] { "variantId", ProductPriceCustomFieldRemovedMessagePayload.builder().variantId(5L) },
+                new Object[] { "staged", ProductPriceCustomFieldRemovedMessagePayload.builder().staged(true) },
+                new Object[] { "name", ProductPriceCustomFieldRemovedMessagePayload.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldRemovedMessageTest.java
index c7c989a6360..77e9ec0b3e4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldRemovedMessageTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceCustomFieldRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceCustomFieldRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceCustomFieldRemovedMessageBuilder builder) {
         ProductPriceCustomFieldRemovedMessage productPriceCustomFieldRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(productPriceCustomFieldRemovedMessage)
                 .isInstanceOf(ProductPriceCustomFieldRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceCustomFieldRemovedMessage.builder().priceId("priceId") },
-                new Object[] { ProductPriceCustomFieldRemovedMessage.builder().variantId(5L) },
-                new Object[] { ProductPriceCustomFieldRemovedMessage.builder().staged(true) },
-                new Object[] { ProductPriceCustomFieldRemovedMessage.builder().name("name") } };
+        return new Object[][] {
+                new Object[] { "priceId", ProductPriceCustomFieldRemovedMessage.builder().priceId("priceId") },
+                new Object[] { "variantId", ProductPriceCustomFieldRemovedMessage.builder().variantId(5L) },
+                new Object[] { "staged", ProductPriceCustomFieldRemovedMessage.builder().staged(true) },
+                new Object[] { "name", ProductPriceCustomFieldRemovedMessage.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsRemovedMessagePayloadTest.java
index ca812f0bc66..be3b50aa612 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsRemovedMessagePayloadTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceCustomFieldsRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceCustomFieldsRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceCustomFieldsRemovedMessagePayloadBuilder builder) {
         ProductPriceCustomFieldsRemovedMessagePayload productPriceCustomFieldsRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productPriceCustomFieldsRemovedMessagePayload)
                 .isInstanceOf(ProductPriceCustomFieldsRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductPriceCustomFieldsRemovedMessagePayload.builder().priceId("priceId") },
-                new Object[] { ProductPriceCustomFieldsRemovedMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductPriceCustomFieldsRemovedMessagePayload.builder().staged(true) } };
+                new Object[] { "priceId", ProductPriceCustomFieldsRemovedMessagePayload.builder().priceId("priceId") },
+                new Object[] { "variantId", ProductPriceCustomFieldsRemovedMessagePayload.builder().variantId(5L) },
+                new Object[] { "staged", ProductPriceCustomFieldsRemovedMessagePayload.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsRemovedMessageTest.java
index 37f2d203758..9464570add9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsRemovedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceCustomFieldsRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceCustomFieldsRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceCustomFieldsRemovedMessageBuilder builder) {
         ProductPriceCustomFieldsRemovedMessage productPriceCustomFieldsRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(productPriceCustomFieldsRemovedMessage)
                 .isInstanceOf(ProductPriceCustomFieldsRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceCustomFieldsRemovedMessage.builder().priceId("priceId") },
-                new Object[] { ProductPriceCustomFieldsRemovedMessage.builder().variantId(5L) },
-                new Object[] { ProductPriceCustomFieldsRemovedMessage.builder().staged(true) } };
+        return new Object[][] {
+                new Object[] { "priceId", ProductPriceCustomFieldsRemovedMessage.builder().priceId("priceId") },
+                new Object[] { "variantId", ProductPriceCustomFieldsRemovedMessage.builder().variantId(5L) },
+                new Object[] { "staged", ProductPriceCustomFieldsRemovedMessage.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsSetMessagePayloadTest.java
index 7a759605be4..6c865ffbe35 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsSetMessagePayloadTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceCustomFieldsSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceCustomFieldsSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceCustomFieldsSetMessagePayloadBuilder builder) {
         ProductPriceCustomFieldsSetMessagePayload productPriceCustomFieldsSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productPriceCustomFieldsSetMessagePayload)
                 .isInstanceOf(ProductPriceCustomFieldsSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceCustomFieldsSetMessagePayload.builder().priceId("priceId") },
-                new Object[] { ProductPriceCustomFieldsSetMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductPriceCustomFieldsSetMessagePayload.builder().staged(true) },
-                new Object[] { ProductPriceCustomFieldsSetMessagePayload.builder()
-                        .customField(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { ProductPriceCustomFieldsSetMessagePayload.builder().oldTypeId("oldTypeId") } };
+        return new Object[][] {
+                new Object[] { "priceId", ProductPriceCustomFieldsSetMessagePayload.builder().priceId("priceId") },
+                new Object[] { "variantId", ProductPriceCustomFieldsSetMessagePayload.builder().variantId(5L) },
+                new Object[] { "staged", ProductPriceCustomFieldsSetMessagePayload.builder().staged(true) },
+                new Object[] { "customField",
+                        ProductPriceCustomFieldsSetMessagePayload.builder()
+                                .customField(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "oldTypeId",
+                        ProductPriceCustomFieldsSetMessagePayload.builder().oldTypeId("oldTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsSetMessageTest.java
index 0ab9b164c7c..f459524375f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceCustomFieldsSetMessageTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceCustomFieldsSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceCustomFieldsSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceCustomFieldsSetMessageBuilder builder) {
         ProductPriceCustomFieldsSetMessage productPriceCustomFieldsSetMessage = builder.buildUnchecked();
         Assertions.assertThat(productPriceCustomFieldsSetMessage)
                 .isInstanceOf(ProductPriceCustomFieldsSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceCustomFieldsSetMessage.builder().priceId("priceId") },
-                new Object[] { ProductPriceCustomFieldsSetMessage.builder().variantId(5L) },
-                new Object[] { ProductPriceCustomFieldsSetMessage.builder().staged(true) },
-                new Object[] { ProductPriceCustomFieldsSetMessage.builder()
-                        .customField(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { ProductPriceCustomFieldsSetMessage.builder().oldTypeId("oldTypeId") } };
+        return new Object[][] {
+                new Object[] { "priceId", ProductPriceCustomFieldsSetMessage.builder().priceId("priceId") },
+                new Object[] { "variantId", ProductPriceCustomFieldsSetMessage.builder().variantId(5L) },
+                new Object[] { "staged", ProductPriceCustomFieldsSetMessage.builder().staged(true) },
+                new Object[] { "customField",
+                        ProductPriceCustomFieldsSetMessage.builder()
+                                .customField(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "oldTypeId", ProductPriceCustomFieldsSetMessage.builder().oldTypeId("oldTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceDiscountsSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceDiscountsSetMessagePayloadTest.java
index 0e649617814..ae0b9e4c990 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceDiscountsSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceDiscountsSetMessagePayloadTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceDiscountsSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceDiscountsSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceDiscountsSetMessagePayloadBuilder builder) {
         ProductPriceDiscountsSetMessagePayload productPriceDiscountsSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productPriceDiscountsSetMessagePayload)
                 .isInstanceOf(ProductPriceDiscountsSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceDiscountsSetMessagePayload.builder()
-                .updatedPrices(Collections.singletonList(
-                    new com.commercetools.api.models.message.ProductPriceDiscountsSetUpdatedPriceImpl())) } };
+        return new Object[][] { new Object[] { "updatedPrices",
+                ProductPriceDiscountsSetMessagePayload.builder()
+                        .updatedPrices(Collections.singletonList(
+                            new com.commercetools.api.models.message.ProductPriceDiscountsSetUpdatedPriceImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceDiscountsSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceDiscountsSetMessageTest.java
index 131fd247242..e239060e4b7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceDiscountsSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceDiscountsSetMessageTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceDiscountsSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceDiscountsSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceDiscountsSetMessageBuilder builder) {
         ProductPriceDiscountsSetMessage productPriceDiscountsSetMessage = builder.buildUnchecked();
         Assertions.assertThat(productPriceDiscountsSetMessage).isInstanceOf(ProductPriceDiscountsSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceDiscountsSetMessage.builder()
-                .updatedPrices(Collections.singletonList(
-                    new com.commercetools.api.models.message.ProductPriceDiscountsSetUpdatedPriceImpl())) } };
+        return new Object[][] { new Object[] { "updatedPrices",
+                ProductPriceDiscountsSetMessage.builder()
+                        .updatedPrices(Collections.singletonList(
+                            new com.commercetools.api.models.message.ProductPriceDiscountsSetUpdatedPriceImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceDiscountsSetUpdatedPriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceDiscountsSetUpdatedPriceTest.java
index 11b0198f606..f48eb577b8a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceDiscountsSetUpdatedPriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceDiscountsSetUpdatedPriceTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceDiscountsSetUpdatedPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceDiscountsSetUpdatedPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceDiscountsSetUpdatedPriceBuilder builder) {
         ProductPriceDiscountsSetUpdatedPrice productPriceDiscountsSetUpdatedPrice = builder.buildUnchecked();
         Assertions.assertThat(productPriceDiscountsSetUpdatedPrice)
                 .isInstanceOf(ProductPriceDiscountsSetUpdatedPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceDiscountsSetUpdatedPrice.builder().variantId(5) },
-                new Object[] { ProductPriceDiscountsSetUpdatedPrice.builder().variantKey("variantKey") },
-                new Object[] { ProductPriceDiscountsSetUpdatedPrice.builder().sku("sku") },
-                new Object[] { ProductPriceDiscountsSetUpdatedPrice.builder().priceId("priceId") },
-                new Object[] { ProductPriceDiscountsSetUpdatedPrice.builder()
-                        .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) },
-                new Object[] { ProductPriceDiscountsSetUpdatedPrice.builder().staged(true) } };
+        return new Object[][] {
+                new Object[] { "variantId", ProductPriceDiscountsSetUpdatedPrice.builder().variantId(5) },
+                new Object[] { "variantKey", ProductPriceDiscountsSetUpdatedPrice.builder().variantKey("variantKey") },
+                new Object[] { "sku", ProductPriceDiscountsSetUpdatedPrice.builder().sku("sku") },
+                new Object[] { "priceId", ProductPriceDiscountsSetUpdatedPrice.builder().priceId("priceId") },
+                new Object[] { "discounted",
+                        ProductPriceDiscountsSetUpdatedPrice.builder()
+                                .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) },
+                new Object[] { "staged", ProductPriceDiscountsSetUpdatedPrice.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceExternalDiscountSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceExternalDiscountSetMessagePayloadTest.java
index a6b5bc77b37..916e1300d18 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceExternalDiscountSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceExternalDiscountSetMessagePayloadTest.java
@@ -1,38 +1,33 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceExternalDiscountSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceExternalDiscountSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceExternalDiscountSetMessagePayloadBuilder builder) {
         ProductPriceExternalDiscountSetMessagePayload productPriceExternalDiscountSetMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productPriceExternalDiscountSetMessagePayload)
                 .isInstanceOf(ProductPriceExternalDiscountSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceExternalDiscountSetMessagePayload.builder().variantId(5) },
-                new Object[] { ProductPriceExternalDiscountSetMessagePayload.builder().variantKey("variantKey") },
-                new Object[] { ProductPriceExternalDiscountSetMessagePayload.builder().sku("sku") },
-                new Object[] { ProductPriceExternalDiscountSetMessagePayload.builder().priceId("priceId") },
-                new Object[] { ProductPriceExternalDiscountSetMessagePayload.builder()
-                        .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) },
-                new Object[] { ProductPriceExternalDiscountSetMessagePayload.builder().staged(true) } };
+        return new Object[][] {
+                new Object[] { "variantId", ProductPriceExternalDiscountSetMessagePayload.builder().variantId(5) },
+                new Object[] { "variantKey",
+                        ProductPriceExternalDiscountSetMessagePayload.builder().variantKey("variantKey") },
+                new Object[] { "sku", ProductPriceExternalDiscountSetMessagePayload.builder().sku("sku") },
+                new Object[] { "priceId", ProductPriceExternalDiscountSetMessagePayload.builder().priceId("priceId") },
+                new Object[] { "discounted",
+                        ProductPriceExternalDiscountSetMessagePayload.builder()
+                                .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) },
+                new Object[] { "staged", ProductPriceExternalDiscountSetMessagePayload.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceExternalDiscountSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceExternalDiscountSetMessageTest.java
index 7ab48d401b6..22aaac2e78a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceExternalDiscountSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceExternalDiscountSetMessageTest.java
@@ -1,37 +1,32 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceExternalDiscountSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceExternalDiscountSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceExternalDiscountSetMessageBuilder builder) {
         ProductPriceExternalDiscountSetMessage productPriceExternalDiscountSetMessage = builder.buildUnchecked();
         Assertions.assertThat(productPriceExternalDiscountSetMessage)
                 .isInstanceOf(ProductPriceExternalDiscountSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceExternalDiscountSetMessage.builder().variantId(5) },
-                new Object[] { ProductPriceExternalDiscountSetMessage.builder().variantKey("variantKey") },
-                new Object[] { ProductPriceExternalDiscountSetMessage.builder().sku("sku") },
-                new Object[] { ProductPriceExternalDiscountSetMessage.builder().priceId("priceId") },
-                new Object[] { ProductPriceExternalDiscountSetMessage.builder()
-                        .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) },
-                new Object[] { ProductPriceExternalDiscountSetMessage.builder().staged(true) } };
+        return new Object[][] {
+                new Object[] { "variantId", ProductPriceExternalDiscountSetMessage.builder().variantId(5) },
+                new Object[] { "variantKey",
+                        ProductPriceExternalDiscountSetMessage.builder().variantKey("variantKey") },
+                new Object[] { "sku", ProductPriceExternalDiscountSetMessage.builder().sku("sku") },
+                new Object[] { "priceId", ProductPriceExternalDiscountSetMessage.builder().priceId("priceId") },
+                new Object[] { "discounted",
+                        ProductPriceExternalDiscountSetMessage.builder()
+                                .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) },
+                new Object[] { "staged", ProductPriceExternalDiscountSetMessage.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceKeySetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceKeySetMessagePayloadTest.java
index 5f5d61f095c..a29de20dc4f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceKeySetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceKeySetMessagePayloadTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceKeySetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceKeySetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceKeySetMessagePayloadBuilder builder) {
         ProductPriceKeySetMessagePayload productPriceKeySetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productPriceKeySetMessagePayload).isInstanceOf(ProductPriceKeySetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceKeySetMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductPriceKeySetMessagePayload.builder().priceId("priceId") },
-                new Object[] { ProductPriceKeySetMessagePayload.builder().oldKey("oldKey") },
-                new Object[] { ProductPriceKeySetMessagePayload.builder().key("key") },
-                new Object[] { ProductPriceKeySetMessagePayload.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductPriceKeySetMessagePayload.builder().variantId(5L) },
+                new Object[] { "priceId", ProductPriceKeySetMessagePayload.builder().priceId("priceId") },
+                new Object[] { "oldKey", ProductPriceKeySetMessagePayload.builder().oldKey("oldKey") },
+                new Object[] { "key", ProductPriceKeySetMessagePayload.builder().key("key") },
+                new Object[] { "staged", ProductPriceKeySetMessagePayload.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceKeySetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceKeySetMessageTest.java
index 09664865447..394dbcbdaf7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceKeySetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceKeySetMessageTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceKeySetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceKeySetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceKeySetMessageBuilder builder) {
         ProductPriceKeySetMessage productPriceKeySetMessage = builder.buildUnchecked();
         Assertions.assertThat(productPriceKeySetMessage).isInstanceOf(ProductPriceKeySetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceKeySetMessage.builder().variantId(5L) },
-                new Object[] { ProductPriceKeySetMessage.builder().priceId("priceId") },
-                new Object[] { ProductPriceKeySetMessage.builder().oldKey("oldKey") },
-                new Object[] { ProductPriceKeySetMessage.builder().key("key") },
-                new Object[] { ProductPriceKeySetMessage.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductPriceKeySetMessage.builder().variantId(5L) },
+                new Object[] { "priceId", ProductPriceKeySetMessage.builder().priceId("priceId") },
+                new Object[] { "oldKey", ProductPriceKeySetMessage.builder().oldKey("oldKey") },
+                new Object[] { "key", ProductPriceKeySetMessage.builder().key("key") },
+                new Object[] { "staged", ProductPriceKeySetMessage.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceModeSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceModeSetMessagePayloadTest.java
index 357c4a5704d..7f490801687 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceModeSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceModeSetMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceModeSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceModeSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceModeSetMessagePayloadBuilder builder) {
         ProductPriceModeSetMessagePayload productPriceModeSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productPriceModeSetMessagePayload).isInstanceOf(ProductPriceModeSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceModeSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "to", ProductPriceModeSetMessagePayload.builder()
                 .to(com.commercetools.api.models.product.ProductPriceModeEnum.findEnum("Embedded")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceModeSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceModeSetMessageTest.java
index ac7b129e641..b767142cad1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceModeSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceModeSetMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceModeSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceModeSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceModeSetMessageBuilder builder) {
         ProductPriceModeSetMessage productPriceModeSetMessage = builder.buildUnchecked();
         Assertions.assertThat(productPriceModeSetMessage).isInstanceOf(ProductPriceModeSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceModeSetMessage.builder()
+        return new Object[][] { new Object[] { "to", ProductPriceModeSetMessage.builder()
                 .to(com.commercetools.api.models.product.ProductPriceModeEnum.findEnum("Embedded")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceRemovedMessagePayloadTest.java
index 1e9558f3cce..9b21626cf1c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceRemovedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceRemovedMessagePayloadBuilder builder) {
         ProductPriceRemovedMessagePayload productPriceRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productPriceRemovedMessagePayload).isInstanceOf(ProductPriceRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceRemovedMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductPriceRemovedMessagePayload.builder()
-                        .price(new com.commercetools.api.models.common.PriceImpl()) },
-                new Object[] { ProductPriceRemovedMessagePayload.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductPriceRemovedMessagePayload.builder().variantId(5L) },
+                new Object[] { "price",
+                        ProductPriceRemovedMessagePayload.builder()
+                                .price(new com.commercetools.api.models.common.PriceImpl()) },
+                new Object[] { "staged", ProductPriceRemovedMessagePayload.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceRemovedMessageTest.java
index a3311012e63..36d6098868a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPriceRemovedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPriceRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPriceRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPriceRemovedMessageBuilder builder) {
         ProductPriceRemovedMessage productPriceRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(productPriceRemovedMessage).isInstanceOf(ProductPriceRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPriceRemovedMessage.builder().variantId(5L) },
-                new Object[] { ProductPriceRemovedMessage.builder()
-                        .price(new com.commercetools.api.models.common.PriceImpl()) },
-                new Object[] { ProductPriceRemovedMessage.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductPriceRemovedMessage.builder().variantId(5L) },
+                new Object[] { "price",
+                        ProductPriceRemovedMessage.builder()
+                                .price(new com.commercetools.api.models.common.PriceImpl()) },
+                new Object[] { "staged", ProductPriceRemovedMessage.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPricesSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPricesSetMessagePayloadTest.java
index c308ef14d4d..3274d905bbb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPricesSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPricesSetMessagePayloadTest.java
@@ -3,33 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPricesSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPricesSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPricesSetMessagePayloadBuilder builder) {
         ProductPricesSetMessagePayload productPricesSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productPricesSetMessagePayload).isInstanceOf(ProductPricesSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPricesSetMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductPricesSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "variantId", ProductPricesSetMessagePayload.builder().variantId(5L) },
+                new Object[] { "prices", ProductPricesSetMessagePayload.builder()
                         .prices(Collections.singletonList(new com.commercetools.api.models.common.PriceImpl())) },
-                new Object[] { ProductPricesSetMessagePayload.builder().staged(true) } };
+                new Object[] { "staged", ProductPricesSetMessagePayload.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPricesSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPricesSetMessageTest.java
index 6fd626cddd5..eeb65bf14e2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPricesSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPricesSetMessageTest.java
@@ -3,33 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPricesSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPricesSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPricesSetMessageBuilder builder) {
         ProductPricesSetMessage productPricesSetMessage = builder.buildUnchecked();
         Assertions.assertThat(productPricesSetMessage).isInstanceOf(ProductPricesSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPricesSetMessage.builder().variantId(5L) },
-                new Object[] { ProductPricesSetMessage.builder()
+        return new Object[][] { new Object[] { "variantId", ProductPricesSetMessage.builder().variantId(5L) },
+                new Object[] { "prices", ProductPricesSetMessage.builder()
                         .prices(Collections.singletonList(new com.commercetools.api.models.common.PriceImpl())) },
-                new Object[] { ProductPricesSetMessage.builder().staged(true) } };
+                new Object[] { "staged", ProductPricesSetMessage.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPublishedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPublishedMessagePayloadTest.java
index d8a813b6ad8..0c37f96ff30 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPublishedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPublishedMessagePayloadTest.java
@@ -3,35 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPublishedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPublishedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPublishedMessagePayloadBuilder builder) {
         ProductPublishedMessagePayload productPublishedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productPublishedMessagePayload).isInstanceOf(ProductPublishedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductPublishedMessagePayload.builder()
-                        .removedImageUrls(Collections.singletonList("removedImageUrls")) },
-                new Object[] { ProductPublishedMessagePayload.builder()
-                        .productProjection(new com.commercetools.api.models.product.ProductProjectionImpl()) },
-                new Object[] { ProductPublishedMessagePayload.builder()
+                new Object[] { "removedImageUrls",
+                        ProductPublishedMessagePayload.builder()
+                                .removedImageUrls(Collections.singletonList("removedImageUrls")) },
+                new Object[] { "productProjection",
+                        ProductPublishedMessagePayload.builder()
+                                .productProjection(new com.commercetools.api.models.product.ProductProjectionImpl()) },
+                new Object[] { "scope", ProductPublishedMessagePayload.builder()
                         .scope(com.commercetools.api.models.cart.ProductPublishScope.findEnum("All")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPublishedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPublishedMessageTest.java
index 4dd541cd5d8..0da90c4d092 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPublishedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductPublishedMessageTest.java
@@ -3,35 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPublishedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPublishedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPublishedMessageBuilder builder) {
         ProductPublishedMessage productPublishedMessage = builder.buildUnchecked();
         Assertions.assertThat(productPublishedMessage).isInstanceOf(ProductPublishedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductPublishedMessage.builder()
-                        .removedImageUrls(Collections.singletonList("removedImageUrls")) },
-                new Object[] { ProductPublishedMessage.builder()
-                        .productProjection(new com.commercetools.api.models.product.ProductProjectionImpl()) },
-                new Object[] { ProductPublishedMessage.builder()
+                new Object[] { "removedImageUrls",
+                        ProductPublishedMessage.builder()
+                                .removedImageUrls(Collections.singletonList("removedImageUrls")) },
+                new Object[] { "productProjection",
+                        ProductPublishedMessage.builder()
+                                .productProjection(new com.commercetools.api.models.product.ProductProjectionImpl()) },
+                new Object[] { "scope", ProductPublishedMessage.builder()
                         .scope(com.commercetools.api.models.cart.ProductPublishScope.findEnum("All")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRemovedFromCategoryMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRemovedFromCategoryMessagePayloadTest.java
index 05730af9c77..c0f23a2b2a3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRemovedFromCategoryMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRemovedFromCategoryMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductRemovedFromCategoryMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductRemovedFromCategoryMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductRemovedFromCategoryMessagePayloadBuilder builder) {
         ProductRemovedFromCategoryMessagePayload productRemovedFromCategoryMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productRemovedFromCategoryMessagePayload)
                 .isInstanceOf(ProductRemovedFromCategoryMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductRemovedFromCategoryMessagePayload.builder()
-                        .category(new com.commercetools.api.models.category.CategoryReferenceImpl()) },
-                new Object[] { ProductRemovedFromCategoryMessagePayload.builder().staged(true) } };
+                new Object[] { "category",
+                        ProductRemovedFromCategoryMessagePayload.builder()
+                                .category(new com.commercetools.api.models.category.CategoryReferenceImpl()) },
+                new Object[] { "staged", ProductRemovedFromCategoryMessagePayload.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRemovedFromCategoryMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRemovedFromCategoryMessageTest.java
index 03651443395..17d440fba4a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRemovedFromCategoryMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRemovedFromCategoryMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductRemovedFromCategoryMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductRemovedFromCategoryMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductRemovedFromCategoryMessageBuilder builder) {
         ProductRemovedFromCategoryMessage productRemovedFromCategoryMessage = builder.buildUnchecked();
         Assertions.assertThat(productRemovedFromCategoryMessage).isInstanceOf(ProductRemovedFromCategoryMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductRemovedFromCategoryMessage.builder()
-                        .category(new com.commercetools.api.models.category.CategoryReferenceImpl()) },
-                new Object[] { ProductRemovedFromCategoryMessage.builder().staged(true) } };
+                new Object[] { "category",
+                        ProductRemovedFromCategoryMessage.builder()
+                                .category(new com.commercetools.api.models.category.CategoryReferenceImpl()) },
+                new Object[] { "staged", ProductRemovedFromCategoryMessage.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRevertedStagedChangesMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRevertedStagedChangesMessagePayloadTest.java
index 15714bf72e9..ea860526050 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRevertedStagedChangesMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRevertedStagedChangesMessagePayloadTest.java
@@ -3,32 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductRevertedStagedChangesMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductRevertedStagedChangesMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductRevertedStagedChangesMessagePayloadBuilder builder) {
         ProductRevertedStagedChangesMessagePayload productRevertedStagedChangesMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productRevertedStagedChangesMessagePayload)
                 .isInstanceOf(ProductRevertedStagedChangesMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductRevertedStagedChangesMessagePayload.builder()
+        return new Object[][] { new Object[] { "removedImageUrls", ProductRevertedStagedChangesMessagePayload.builder()
                 .removedImageUrls(Collections.singletonList("removedImageUrls")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRevertedStagedChangesMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRevertedStagedChangesMessageTest.java
index 7f98a39c8b2..bfd6606ab27 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRevertedStagedChangesMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductRevertedStagedChangesMessageTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductRevertedStagedChangesMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductRevertedStagedChangesMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductRevertedStagedChangesMessageBuilder builder) {
         ProductRevertedStagedChangesMessage productRevertedStagedChangesMessage = builder.buildUnchecked();
         Assertions.assertThat(productRevertedStagedChangesMessage)
                 .isInstanceOf(ProductRevertedStagedChangesMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductRevertedStagedChangesMessage.builder()
+        return new Object[][] { new Object[] { "removedImageUrls", ProductRevertedStagedChangesMessage.builder()
                 .removedImageUrls(Collections.singletonList("removedImageUrls")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionCreatedMessagePayloadTest.java
index f0c9934ff57..cbab5a45774 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionCreatedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionCreatedMessagePayloadBuilder builder) {
         ProductSelectionCreatedMessagePayload productSelectionCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productSelectionCreatedMessagePayload)
                 .isInstanceOf(ProductSelectionCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "productSelection", ProductSelectionCreatedMessagePayload.builder()
                 .productSelection(new com.commercetools.api.models.product_selection.ProductSelectionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionCreatedMessageTest.java
index 0285ccd756b..7bd0481c2ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionCreatedMessageBuilder builder) {
         ProductSelectionCreatedMessage productSelectionCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(productSelectionCreatedMessage).isInstanceOf(ProductSelectionCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionCreatedMessage.builder()
+        return new Object[][] { new Object[] { "productSelection", ProductSelectionCreatedMessage.builder()
                 .productSelection(new com.commercetools.api.models.product_selection.ProductSelectionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionDeletedMessagePayloadTest.java
index 3fcc8c98094..a10d7eddd08 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionDeletedMessagePayloadTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionDeletedMessagePayloadTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionDeletedMessageTest.java
index 1eb92069aa7..fd64d924ab8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionDeletedMessageTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionDeletedMessageTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductAddedMessagePayloadTest.java
index 0036f06bb98..ee7e7f14a64 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductAddedMessagePayloadTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionProductAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionProductAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionProductAddedMessagePayloadBuilder builder) {
         ProductSelectionProductAddedMessagePayload productSelectionProductAddedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productSelectionProductAddedMessagePayload)
                 .isInstanceOf(ProductSelectionProductAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionProductAddedMessagePayload.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductSelectionProductAddedMessagePayload.builder()
+                new Object[] { "product",
+                        ProductSelectionProductAddedMessagePayload.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantSelection", ProductSelectionProductAddedMessagePayload.builder()
                         .variantSelection(
                             new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductAddedMessageTest.java
index 4440f0de05b..5997a392214 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductAddedMessageTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionProductAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionProductAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionProductAddedMessageBuilder builder) {
         ProductSelectionProductAddedMessage productSelectionProductAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(productSelectionProductAddedMessage)
                 .isInstanceOf(ProductSelectionProductAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionProductAddedMessage.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductSelectionProductAddedMessage.builder()
+                new Object[] { "product",
+                        ProductSelectionProductAddedMessage.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantSelection", ProductSelectionProductAddedMessage.builder()
                         .variantSelection(
                             new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductExcludedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductExcludedMessagePayloadTest.java
index 5a33a43d217..7dbd510a6b6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductExcludedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductExcludedMessagePayloadTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionProductExcludedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionProductExcludedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionProductExcludedMessagePayloadBuilder builder) {
         ProductSelectionProductExcludedMessagePayload productSelectionProductExcludedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productSelectionProductExcludedMessagePayload)
                 .isInstanceOf(ProductSelectionProductExcludedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionProductExcludedMessagePayload.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductSelectionProductExcludedMessagePayload.builder()
+                new Object[] { "product",
+                        ProductSelectionProductExcludedMessagePayload.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantExclusion", ProductSelectionProductExcludedMessagePayload.builder()
                         .variantExclusion(
                             new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductExcludedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductExcludedMessageTest.java
index 00456f46b11..abafcd9b649 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductExcludedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductExcludedMessageTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionProductExcludedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionProductExcludedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionProductExcludedMessageBuilder builder) {
         ProductSelectionProductExcludedMessage productSelectionProductExcludedMessage = builder.buildUnchecked();
         Assertions.assertThat(productSelectionProductExcludedMessage)
                 .isInstanceOf(ProductSelectionProductExcludedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionProductExcludedMessage.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductSelectionProductExcludedMessage.builder()
+                new Object[] { "product",
+                        ProductSelectionProductExcludedMessage.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantExclusion", ProductSelectionProductExcludedMessage.builder()
                         .variantExclusion(
                             new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductRemovedMessagePayloadTest.java
index 67e2e1473c8..5d7b41a0c12 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductRemovedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionProductRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionProductRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionProductRemovedMessagePayloadBuilder builder) {
         ProductSelectionProductRemovedMessagePayload productSelectionProductRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productSelectionProductRemovedMessagePayload)
                 .isInstanceOf(ProductSelectionProductRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionProductRemovedMessagePayload.builder()
+        return new Object[][] { new Object[] { "product", ProductSelectionProductRemovedMessagePayload.builder()
                 .product(new com.commercetools.api.models.product.ProductReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductRemovedMessageTest.java
index ff19d759948..26ac2dc0352 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionProductRemovedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionProductRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionProductRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionProductRemovedMessageBuilder builder) {
         ProductSelectionProductRemovedMessage productSelectionProductRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(productSelectionProductRemovedMessage)
                 .isInstanceOf(ProductSelectionProductRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionProductRemovedMessage.builder()
+        return new Object[][] { new Object[] { "product", ProductSelectionProductRemovedMessage.builder()
                 .product(new com.commercetools.api.models.product.ProductReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantExclusionChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantExclusionChangedMessagePayloadTest.java
index 2df386e93fb..9d85407d402 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantExclusionChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantExclusionChangedMessagePayloadTest.java
@@ -1,38 +1,32 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionVariantExclusionChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionVariantExclusionChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionVariantExclusionChangedMessagePayloadBuilder builder) {
         ProductSelectionVariantExclusionChangedMessagePayload productSelectionVariantExclusionChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productSelectionVariantExclusionChangedMessagePayload)
                 .isInstanceOf(ProductSelectionVariantExclusionChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionVariantExclusionChangedMessagePayload.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductSelectionVariantExclusionChangedMessagePayload.builder()
-                        .oldVariantExclusion(
-                            new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) },
-                new Object[] { ProductSelectionVariantExclusionChangedMessagePayload.builder()
+                new Object[] { "product",
+                        ProductSelectionVariantExclusionChangedMessagePayload.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "oldVariantExclusion",
+                        ProductSelectionVariantExclusionChangedMessagePayload.builder()
+                                .oldVariantExclusion(
+                                    new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) },
+                new Object[] { "newVariantExclusion", ProductSelectionVariantExclusionChangedMessagePayload.builder()
                         .newVariantExclusion(
                             new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantExclusionChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantExclusionChangedMessageTest.java
index fd31c11e762..e89eca62ef5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantExclusionChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantExclusionChangedMessageTest.java
@@ -1,38 +1,32 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionVariantExclusionChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionVariantExclusionChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionVariantExclusionChangedMessageBuilder builder) {
         ProductSelectionVariantExclusionChangedMessage productSelectionVariantExclusionChangedMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(productSelectionVariantExclusionChangedMessage)
                 .isInstanceOf(ProductSelectionVariantExclusionChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionVariantExclusionChangedMessage.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductSelectionVariantExclusionChangedMessage.builder()
-                        .oldVariantExclusion(
-                            new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) },
-                new Object[] { ProductSelectionVariantExclusionChangedMessage.builder()
+                new Object[] { "product",
+                        ProductSelectionVariantExclusionChangedMessage.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "oldVariantExclusion",
+                        ProductSelectionVariantExclusionChangedMessage.builder()
+                                .oldVariantExclusion(
+                                    new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) },
+                new Object[] { "newVariantExclusion", ProductSelectionVariantExclusionChangedMessage.builder()
                         .newVariantExclusion(
                             new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantSelectionChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantSelectionChangedMessagePayloadTest.java
index 606a2d646af..f35e368fa7c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantSelectionChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantSelectionChangedMessagePayloadTest.java
@@ -1,38 +1,32 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionVariantSelectionChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionVariantSelectionChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionVariantSelectionChangedMessagePayloadBuilder builder) {
         ProductSelectionVariantSelectionChangedMessagePayload productSelectionVariantSelectionChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productSelectionVariantSelectionChangedMessagePayload)
                 .isInstanceOf(ProductSelectionVariantSelectionChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionVariantSelectionChangedMessagePayload.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductSelectionVariantSelectionChangedMessagePayload.builder()
-                        .oldVariantSelection(
-                            new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) },
-                new Object[] { ProductSelectionVariantSelectionChangedMessagePayload.builder()
+                new Object[] { "product",
+                        ProductSelectionVariantSelectionChangedMessagePayload.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "oldVariantSelection",
+                        ProductSelectionVariantSelectionChangedMessagePayload.builder()
+                                .oldVariantSelection(
+                                    new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) },
+                new Object[] { "newVariantSelection", ProductSelectionVariantSelectionChangedMessagePayload.builder()
                         .newVariantSelection(
                             new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantSelectionChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantSelectionChangedMessageTest.java
index 17f7583dbc8..ab417381102 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantSelectionChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSelectionVariantSelectionChangedMessageTest.java
@@ -1,38 +1,32 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionVariantSelectionChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionVariantSelectionChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionVariantSelectionChangedMessageBuilder builder) {
         ProductSelectionVariantSelectionChangedMessage productSelectionVariantSelectionChangedMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(productSelectionVariantSelectionChangedMessage)
                 .isInstanceOf(ProductSelectionVariantSelectionChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionVariantSelectionChangedMessage.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductSelectionVariantSelectionChangedMessage.builder()
-                        .oldVariantSelection(
-                            new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) },
-                new Object[] { ProductSelectionVariantSelectionChangedMessage.builder()
+                new Object[] { "product",
+                        ProductSelectionVariantSelectionChangedMessage.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "oldVariantSelection",
+                        ProductSelectionVariantSelectionChangedMessage.builder()
+                                .oldVariantSelection(
+                                    new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) },
+                new Object[] { "newVariantSelection", ProductSelectionVariantSelectionChangedMessage.builder()
                         .newVariantSelection(
                             new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSlugChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSlugChangedMessagePayloadTest.java
index 933687e098d..954d9d03e5a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSlugChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSlugChangedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSlugChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSlugChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSlugChangedMessagePayloadBuilder builder) {
         ProductSlugChangedMessagePayload productSlugChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productSlugChangedMessagePayload).isInstanceOf(ProductSlugChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSlugChangedMessagePayload.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductSlugChangedMessagePayload.builder()
+                new Object[] { "slug",
+                        ProductSlugChangedMessagePayload.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "oldSlug", ProductSlugChangedMessagePayload.builder()
                         .oldSlug(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSlugChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSlugChangedMessageTest.java
index bda288c2624..a0bf592e422 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSlugChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductSlugChangedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSlugChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSlugChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSlugChangedMessageBuilder builder) {
         ProductSlugChangedMessage productSlugChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(productSlugChangedMessage).isInstanceOf(ProductSlugChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSlugChangedMessage.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductSlugChangedMessage.builder()
+                new Object[] { "slug",
+                        ProductSlugChangedMessage.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "oldSlug", ProductSlugChangedMessage.builder()
                         .oldSlug(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductStateTransitionMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductStateTransitionMessagePayloadTest.java
index 8705ca34df1..128051075a2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductStateTransitionMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductStateTransitionMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductStateTransitionMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductStateTransitionMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductStateTransitionMessagePayloadBuilder builder) {
         ProductStateTransitionMessagePayload productStateTransitionMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productStateTransitionMessagePayload)
                 .isInstanceOf(ProductStateTransitionMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductStateTransitionMessagePayload.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { ProductStateTransitionMessagePayload.builder().force(true) } };
+                new Object[] { "state",
+                        ProductStateTransitionMessagePayload.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "force", ProductStateTransitionMessagePayload.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductStateTransitionMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductStateTransitionMessageTest.java
index 3c34b1e3c0e..eaec13d07ea 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductStateTransitionMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductStateTransitionMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductStateTransitionMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductStateTransitionMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductStateTransitionMessageBuilder builder) {
         ProductStateTransitionMessage productStateTransitionMessage = builder.buildUnchecked();
         Assertions.assertThat(productStateTransitionMessage).isInstanceOf(ProductStateTransitionMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductStateTransitionMessage.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { ProductStateTransitionMessage.builder().force(true) } };
+                new Object[] { "state",
+                        ProductStateTransitionMessage.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "force", ProductStateTransitionMessage.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringCreatedMessagePayloadTest.java
index 09e5fcb42b4..78ca1690255 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringCreatedMessagePayloadTest.java
@@ -3,52 +3,52 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringCreatedMessagePayloadBuilder builder) {
         ProductTailoringCreatedMessagePayload productTailoringCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productTailoringCreatedMessagePayload)
                 .isInstanceOf(ProductTailoringCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringCreatedMessagePayload.builder().key("key") },
-                new Object[] { ProductTailoringCreatedMessagePayload.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringCreatedMessagePayload.builder().productKey("productKey") },
-                new Object[] { ProductTailoringCreatedMessagePayload.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoringCreatedMessagePayload.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringCreatedMessagePayload.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringCreatedMessagePayload.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringCreatedMessagePayload.builder()
-                        .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringCreatedMessagePayload.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringCreatedMessagePayload.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "key", ProductTailoringCreatedMessagePayload.builder().key("key") },
+                new Object[] { "store",
+                        ProductTailoringCreatedMessagePayload.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringCreatedMessagePayload.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductTailoringCreatedMessagePayload.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "description",
+                        ProductTailoringCreatedMessagePayload.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "name",
+                        ProductTailoringCreatedMessagePayload.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "slug",
+                        ProductTailoringCreatedMessagePayload.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaTitle",
+                        ProductTailoringCreatedMessagePayload.builder()
+                                .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        ProductTailoringCreatedMessagePayload.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        ProductTailoringCreatedMessagePayload.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "variants", ProductTailoringCreatedMessagePayload.builder()
                         .variants(Collections.singletonList(
                             new com.commercetools.api.models.product_tailoring.ProductVariantTailoringImpl())) },
-                new Object[] { ProductTailoringCreatedMessagePayload.builder().published(true) } };
+                new Object[] { "published", ProductTailoringCreatedMessagePayload.builder().published(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringCreatedMessageTest.java
index 5d1c48541a5..926b0d0e064 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringCreatedMessageTest.java
@@ -3,51 +3,51 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringCreatedMessageBuilder builder) {
         ProductTailoringCreatedMessage productTailoringCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(productTailoringCreatedMessage).isInstanceOf(ProductTailoringCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringCreatedMessage.builder().key("key") },
-                new Object[] { ProductTailoringCreatedMessage.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringCreatedMessage.builder().productKey("productKey") },
-                new Object[] { ProductTailoringCreatedMessage.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoringCreatedMessage.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringCreatedMessage.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringCreatedMessage.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringCreatedMessage.builder()
-                        .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringCreatedMessage.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringCreatedMessage.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringCreatedMessage.builder()
+        return new Object[][] { new Object[] { "key", ProductTailoringCreatedMessage.builder().key("key") },
+                new Object[] { "store",
+                        ProductTailoringCreatedMessage.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringCreatedMessage.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductTailoringCreatedMessage.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "description",
+                        ProductTailoringCreatedMessage.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "name",
+                        ProductTailoringCreatedMessage.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "slug",
+                        ProductTailoringCreatedMessage.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaTitle",
+                        ProductTailoringCreatedMessage.builder()
+                                .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        ProductTailoringCreatedMessage.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        ProductTailoringCreatedMessage.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "variants", ProductTailoringCreatedMessage.builder()
                         .variants(Collections.singletonList(
                             new com.commercetools.api.models.product_tailoring.ProductVariantTailoringImpl())) },
-                new Object[] { ProductTailoringCreatedMessage.builder().published(true) } };
+                new Object[] { "published", ProductTailoringCreatedMessage.builder().published(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDeletedMessagePayloadTest.java
index c6a8d25a191..d69321491c1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDeletedMessagePayloadTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringDeletedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringDeletedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringDeletedMessagePayloadBuilder builder) {
         ProductTailoringDeletedMessagePayload productTailoringDeletedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productTailoringDeletedMessagePayload)
                 .isInstanceOf(ProductTailoringDeletedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringDeletedMessagePayload.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringDeletedMessagePayload.builder().productKey("productKey") },
-                new Object[] { ProductTailoringDeletedMessagePayload.builder()
+                new Object[] { "store",
+                        ProductTailoringDeletedMessagePayload.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringDeletedMessagePayload.builder().productKey("productKey") },
+                new Object[] { "product", ProductTailoringDeletedMessagePayload.builder()
                         .product(new com.commercetools.api.models.product.ProductReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDeletedMessageTest.java
index f3691bd5033..88aa6ac9968 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDeletedMessageTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringDeletedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringDeletedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringDeletedMessageBuilder builder) {
         ProductTailoringDeletedMessage productTailoringDeletedMessage = builder.buildUnchecked();
         Assertions.assertThat(productTailoringDeletedMessage).isInstanceOf(ProductTailoringDeletedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringDeletedMessage.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringDeletedMessage.builder().productKey("productKey") },
-                new Object[] { ProductTailoringDeletedMessage.builder()
+                new Object[] { "store",
+                        ProductTailoringDeletedMessage.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringDeletedMessage.builder().productKey("productKey") },
+                new Object[] { "product", ProductTailoringDeletedMessage.builder()
                         .product(new com.commercetools.api.models.product.ProductReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDescriptionSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDescriptionSetMessagePayloadTest.java
index fd46380cd0e..a3d7ee0553c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDescriptionSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDescriptionSetMessagePayloadTest.java
@@ -1,40 +1,36 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringDescriptionSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringDescriptionSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringDescriptionSetMessagePayloadBuilder builder) {
         ProductTailoringDescriptionSetMessagePayload productTailoringDescriptionSetMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productTailoringDescriptionSetMessagePayload)
                 .isInstanceOf(ProductTailoringDescriptionSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringDescriptionSetMessagePayload.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringDescriptionSetMessagePayload.builder().productKey("productKey") },
-                new Object[] { ProductTailoringDescriptionSetMessagePayload.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoringDescriptionSetMessagePayload.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringDescriptionSetMessagePayload.builder()
+                new Object[] { "store",
+                        ProductTailoringDescriptionSetMessagePayload.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey",
+                        ProductTailoringDescriptionSetMessagePayload.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductTailoringDescriptionSetMessagePayload.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "description",
+                        ProductTailoringDescriptionSetMessagePayload.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "oldDescription", ProductTailoringDescriptionSetMessagePayload.builder()
                         .oldDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDescriptionSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDescriptionSetMessageTest.java
index e2f37484ca6..150b142c7f4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDescriptionSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringDescriptionSetMessageTest.java
@@ -1,39 +1,34 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringDescriptionSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringDescriptionSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringDescriptionSetMessageBuilder builder) {
         ProductTailoringDescriptionSetMessage productTailoringDescriptionSetMessage = builder.buildUnchecked();
         Assertions.assertThat(productTailoringDescriptionSetMessage)
                 .isInstanceOf(ProductTailoringDescriptionSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringDescriptionSetMessage.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringDescriptionSetMessage.builder().productKey("productKey") },
-                new Object[] { ProductTailoringDescriptionSetMessage.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoringDescriptionSetMessage.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringDescriptionSetMessage.builder()
+                new Object[] { "store",
+                        ProductTailoringDescriptionSetMessage.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringDescriptionSetMessage.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductTailoringDescriptionSetMessage.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "description",
+                        ProductTailoringDescriptionSetMessage.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "oldDescription", ProductTailoringDescriptionSetMessage.builder()
                         .oldDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImageAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImageAddedMessagePayloadTest.java
index be0c4708d6e..72c2a6fdb34 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImageAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImageAddedMessagePayloadTest.java
@@ -1,38 +1,33 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringImageAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringImageAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringImageAddedMessagePayloadBuilder builder) {
         ProductTailoringImageAddedMessagePayload productTailoringImageAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productTailoringImageAddedMessagePayload)
                 .isInstanceOf(ProductTailoringImageAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringImageAddedMessagePayload.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringImageAddedMessagePayload.builder().productKey("productKey") },
-                new Object[] { ProductTailoringImageAddedMessagePayload.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoringImageAddedMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductTailoringImageAddedMessagePayload.builder()
+                new Object[] { "store",
+                        ProductTailoringImageAddedMessagePayload.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey",
+                        ProductTailoringImageAddedMessagePayload.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductTailoringImageAddedMessagePayload.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantId", ProductTailoringImageAddedMessagePayload.builder().variantId(5L) },
+                new Object[] { "image", ProductTailoringImageAddedMessagePayload.builder()
                         .image(new com.commercetools.api.models.common.ImageImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImageAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImageAddedMessageTest.java
index 48bc0497756..372cae3039f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImageAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImageAddedMessageTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringImageAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringImageAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringImageAddedMessageBuilder builder) {
         ProductTailoringImageAddedMessage productTailoringImageAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(productTailoringImageAddedMessage).isInstanceOf(ProductTailoringImageAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringImageAddedMessage.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringImageAddedMessage.builder().productKey("productKey") },
-                new Object[] { ProductTailoringImageAddedMessage.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoringImageAddedMessage.builder().variantId(5L) },
-                new Object[] { ProductTailoringImageAddedMessage.builder()
+                new Object[] { "store",
+                        ProductTailoringImageAddedMessage.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringImageAddedMessage.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductTailoringImageAddedMessage.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantId", ProductTailoringImageAddedMessage.builder().variantId(5L) },
+                new Object[] { "image", ProductTailoringImageAddedMessage.builder()
                         .image(new com.commercetools.api.models.common.ImageImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImagesSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImagesSetMessagePayloadTest.java
index 3ba521fab36..0e23ce533ab 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImagesSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImagesSetMessagePayloadTest.java
@@ -3,40 +3,35 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringImagesSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringImagesSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringImagesSetMessagePayloadBuilder builder) {
         ProductTailoringImagesSetMessagePayload productTailoringImagesSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productTailoringImagesSetMessagePayload)
                 .isInstanceOf(ProductTailoringImagesSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringImagesSetMessagePayload.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringImagesSetMessagePayload.builder().productKey("productKey") },
-                new Object[] { ProductTailoringImagesSetMessagePayload.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoringImagesSetMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductTailoringImagesSetMessagePayload.builder()
+                new Object[] { "store",
+                        ProductTailoringImagesSetMessagePayload.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey",
+                        ProductTailoringImagesSetMessagePayload.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductTailoringImagesSetMessagePayload.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantId", ProductTailoringImagesSetMessagePayload.builder().variantId(5L) },
+                new Object[] { "oldImages", ProductTailoringImagesSetMessagePayload.builder()
                         .oldImages(Collections.singletonList(new com.commercetools.api.models.common.ImageImpl())) },
-                new Object[] { ProductTailoringImagesSetMessagePayload.builder()
+                new Object[] { "images", ProductTailoringImagesSetMessagePayload.builder()
                         .images(Collections.singletonList(new com.commercetools.api.models.common.ImageImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImagesSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImagesSetMessageTest.java
index 5bb6f185617..8328abb5df0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImagesSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringImagesSetMessageTest.java
@@ -3,39 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringImagesSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringImagesSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringImagesSetMessageBuilder builder) {
         ProductTailoringImagesSetMessage productTailoringImagesSetMessage = builder.buildUnchecked();
         Assertions.assertThat(productTailoringImagesSetMessage).isInstanceOf(ProductTailoringImagesSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringImagesSetMessage.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringImagesSetMessage.builder().productKey("productKey") },
-                new Object[] { ProductTailoringImagesSetMessage.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoringImagesSetMessage.builder().variantId(5L) },
-                new Object[] { ProductTailoringImagesSetMessage.builder()
+                new Object[] { "store",
+                        ProductTailoringImagesSetMessage.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringImagesSetMessage.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductTailoringImagesSetMessage.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantId", ProductTailoringImagesSetMessage.builder().variantId(5L) },
+                new Object[] { "oldImages", ProductTailoringImagesSetMessage.builder()
                         .oldImages(Collections.singletonList(new com.commercetools.api.models.common.ImageImpl())) },
-                new Object[] { ProductTailoringImagesSetMessage.builder()
+                new Object[] { "images", ProductTailoringImagesSetMessage.builder()
                         .images(Collections.singletonList(new com.commercetools.api.models.common.ImageImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringNameSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringNameSetMessagePayloadTest.java
index 8da38b429d8..f624de2f4fc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringNameSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringNameSetMessagePayloadTest.java
@@ -1,39 +1,34 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringNameSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringNameSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringNameSetMessagePayloadBuilder builder) {
         ProductTailoringNameSetMessagePayload productTailoringNameSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productTailoringNameSetMessagePayload)
                 .isInstanceOf(ProductTailoringNameSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringNameSetMessagePayload.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringNameSetMessagePayload.builder().productKey("productKey") },
-                new Object[] { ProductTailoringNameSetMessagePayload.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoringNameSetMessagePayload.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringNameSetMessagePayload.builder()
+                new Object[] { "store",
+                        ProductTailoringNameSetMessagePayload.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringNameSetMessagePayload.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductTailoringNameSetMessagePayload.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "name",
+                        ProductTailoringNameSetMessagePayload.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "oldName", ProductTailoringNameSetMessagePayload.builder()
                         .oldName(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringNameSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringNameSetMessageTest.java
index 292262c7bc5..eac21cc4aee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringNameSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringNameSetMessageTest.java
@@ -1,38 +1,33 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringNameSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringNameSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringNameSetMessageBuilder builder) {
         ProductTailoringNameSetMessage productTailoringNameSetMessage = builder.buildUnchecked();
         Assertions.assertThat(productTailoringNameSetMessage).isInstanceOf(ProductTailoringNameSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringNameSetMessage.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringNameSetMessage.builder().productKey("productKey") },
-                new Object[] { ProductTailoringNameSetMessage.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoringNameSetMessage.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringNameSetMessage.builder()
+                new Object[] { "store",
+                        ProductTailoringNameSetMessage.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringNameSetMessage.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductTailoringNameSetMessage.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "name",
+                        ProductTailoringNameSetMessage.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "oldName", ProductTailoringNameSetMessage.builder()
                         .oldName(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringPublishedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringPublishedMessagePayloadTest.java
index 64a594e181d..0c49e865cbe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringPublishedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringPublishedMessagePayloadTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringPublishedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringPublishedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringPublishedMessagePayloadBuilder builder) {
         ProductTailoringPublishedMessagePayload productTailoringPublishedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productTailoringPublishedMessagePayload)
                 .isInstanceOf(ProductTailoringPublishedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringPublishedMessagePayload.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringPublishedMessagePayload.builder().productKey("productKey") },
-                new Object[] { ProductTailoringPublishedMessagePayload.builder()
+                new Object[] { "store",
+                        ProductTailoringPublishedMessagePayload.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey",
+                        ProductTailoringPublishedMessagePayload.builder().productKey("productKey") },
+                new Object[] { "product", ProductTailoringPublishedMessagePayload.builder()
                         .product(new com.commercetools.api.models.product.ProductReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringPublishedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringPublishedMessageTest.java
index 1fb1e54eaaf..4aed8086954 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringPublishedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringPublishedMessageTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringPublishedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringPublishedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringPublishedMessageBuilder builder) {
         ProductTailoringPublishedMessage productTailoringPublishedMessage = builder.buildUnchecked();
         Assertions.assertThat(productTailoringPublishedMessage).isInstanceOf(ProductTailoringPublishedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringPublishedMessage.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringPublishedMessage.builder().productKey("productKey") },
-                new Object[] { ProductTailoringPublishedMessage.builder()
+                new Object[] { "store",
+                        ProductTailoringPublishedMessage.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringPublishedMessage.builder().productKey("productKey") },
+                new Object[] { "product", ProductTailoringPublishedMessage.builder()
                         .product(new com.commercetools.api.models.product.ProductReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringSlugSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringSlugSetMessagePayloadTest.java
index d32f7fb5ac1..0a340ee31cb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringSlugSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringSlugSetMessagePayloadTest.java
@@ -1,39 +1,34 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSlugSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSlugSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSlugSetMessagePayloadBuilder builder) {
         ProductTailoringSlugSetMessagePayload productTailoringSlugSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSlugSetMessagePayload)
                 .isInstanceOf(ProductTailoringSlugSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringSlugSetMessagePayload.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringSlugSetMessagePayload.builder().productKey("productKey") },
-                new Object[] { ProductTailoringSlugSetMessagePayload.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoringSlugSetMessagePayload.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringSlugSetMessagePayload.builder()
+                new Object[] { "store",
+                        ProductTailoringSlugSetMessagePayload.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringSlugSetMessagePayload.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductTailoringSlugSetMessagePayload.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "slug",
+                        ProductTailoringSlugSetMessagePayload.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "oldSlug", ProductTailoringSlugSetMessagePayload.builder()
                         .oldSlug(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringSlugSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringSlugSetMessageTest.java
index 63afa7cc312..1fb74b8878c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringSlugSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringSlugSetMessageTest.java
@@ -1,38 +1,33 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSlugSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSlugSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSlugSetMessageBuilder builder) {
         ProductTailoringSlugSetMessage productTailoringSlugSetMessage = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSlugSetMessage).isInstanceOf(ProductTailoringSlugSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringSlugSetMessage.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringSlugSetMessage.builder().productKey("productKey") },
-                new Object[] { ProductTailoringSlugSetMessage.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoringSlugSetMessage.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringSlugSetMessage.builder()
+                new Object[] { "store",
+                        ProductTailoringSlugSetMessage.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringSlugSetMessage.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductTailoringSlugSetMessage.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "slug",
+                        ProductTailoringSlugSetMessage.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "oldSlug", ProductTailoringSlugSetMessage.builder()
                         .oldSlug(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringUnpublishedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringUnpublishedMessagePayloadTest.java
index e310e269938..788d2c9826f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringUnpublishedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringUnpublishedMessagePayloadTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringUnpublishedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringUnpublishedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringUnpublishedMessagePayloadBuilder builder) {
         ProductTailoringUnpublishedMessagePayload productTailoringUnpublishedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productTailoringUnpublishedMessagePayload)
                 .isInstanceOf(ProductTailoringUnpublishedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringUnpublishedMessagePayload.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringUnpublishedMessagePayload.builder().productKey("productKey") },
-                new Object[] { ProductTailoringUnpublishedMessagePayload.builder()
+                new Object[] { "store",
+                        ProductTailoringUnpublishedMessagePayload.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey",
+                        ProductTailoringUnpublishedMessagePayload.builder().productKey("productKey") },
+                new Object[] { "product", ProductTailoringUnpublishedMessagePayload.builder()
                         .product(new com.commercetools.api.models.product.ProductReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringUnpublishedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringUnpublishedMessageTest.java
index 7b690060b47..1628439d926 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringUnpublishedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductTailoringUnpublishedMessageTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringUnpublishedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringUnpublishedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringUnpublishedMessageBuilder builder) {
         ProductTailoringUnpublishedMessage productTailoringUnpublishedMessage = builder.buildUnchecked();
         Assertions.assertThat(productTailoringUnpublishedMessage)
                 .isInstanceOf(ProductTailoringUnpublishedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringUnpublishedMessage.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoringUnpublishedMessage.builder().productKey("productKey") },
-                new Object[] { ProductTailoringUnpublishedMessage.builder()
+                new Object[] { "store",
+                        ProductTailoringUnpublishedMessage.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductTailoringUnpublishedMessage.builder().productKey("productKey") },
+                new Object[] { "product", ProductTailoringUnpublishedMessage.builder()
                         .product(new com.commercetools.api.models.product.ProductReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductUnpublishedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductUnpublishedMessagePayloadTest.java
index 67b2770919f..04fcf8681a2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductUnpublishedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductUnpublishedMessagePayloadTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductUnpublishedMessagePayloadTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductUnpublishedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductUnpublishedMessageTest.java
index a118570cf23..dc331157e3b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductUnpublishedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductUnpublishedMessageTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductUnpublishedMessageTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantAddedMessagePayloadTest.java
index 4187188d5fc..c8958aa3f52 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantAddedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantAddedMessagePayloadBuilder builder) {
         ProductVariantAddedMessagePayload productVariantAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productVariantAddedMessagePayload).isInstanceOf(ProductVariantAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductVariantAddedMessagePayload.builder()
-                        .variant(new com.commercetools.api.models.product.ProductVariantImpl()) },
-                new Object[] { ProductVariantAddedMessagePayload.builder().staged(true) } };
+                new Object[] { "variant",
+                        ProductVariantAddedMessagePayload.builder()
+                                .variant(new com.commercetools.api.models.product.ProductVariantImpl()) },
+                new Object[] { "staged", ProductVariantAddedMessagePayload.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantAddedMessageTest.java
index 1edd9abadd3..004b93ef65a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantAddedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantAddedMessageBuilder builder) {
         ProductVariantAddedMessage productVariantAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(productVariantAddedMessage).isInstanceOf(ProductVariantAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductVariantAddedMessage.builder()
-                        .variant(new com.commercetools.api.models.product.ProductVariantImpl()) },
-                new Object[] { ProductVariantAddedMessage.builder().staged(true) } };
+                new Object[] { "variant",
+                        ProductVariantAddedMessage.builder()
+                                .variant(new com.commercetools.api.models.product.ProductVariantImpl()) },
+                new Object[] { "staged", ProductVariantAddedMessage.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantDeletedMessagePayloadTest.java
index 731771a4de3..17abb41aa36 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantDeletedMessagePayloadTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantDeletedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantDeletedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantDeletedMessagePayloadBuilder builder) {
         ProductVariantDeletedMessagePayload productVariantDeletedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(productVariantDeletedMessagePayload)
                 .isInstanceOf(ProductVariantDeletedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductVariantDeletedMessagePayload.builder()
-                        .variant(new com.commercetools.api.models.product.ProductVariantImpl()) },
-                new Object[] { ProductVariantDeletedMessagePayload.builder()
-                        .removedImageUrls(Collections.singletonList("removedImageUrls")) },
-                new Object[] { ProductVariantDeletedMessagePayload.builder().staged(true) } };
+                new Object[] { "variant",
+                        ProductVariantDeletedMessagePayload.builder()
+                                .variant(new com.commercetools.api.models.product.ProductVariantImpl()) },
+                new Object[] { "removedImageUrls",
+                        ProductVariantDeletedMessagePayload.builder()
+                                .removedImageUrls(Collections.singletonList("removedImageUrls")) },
+                new Object[] { "staged", ProductVariantDeletedMessagePayload.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantDeletedMessageTest.java
index a00d82ac587..ad2c422e3bf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantDeletedMessageTest.java
@@ -3,35 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantDeletedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantDeletedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantDeletedMessageBuilder builder) {
         ProductVariantDeletedMessage productVariantDeletedMessage = builder.buildUnchecked();
         Assertions.assertThat(productVariantDeletedMessage).isInstanceOf(ProductVariantDeletedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductVariantDeletedMessage.builder()
-                        .variant(new com.commercetools.api.models.product.ProductVariantImpl()) },
-                new Object[] { ProductVariantDeletedMessage.builder()
-                        .removedImageUrls(Collections.singletonList("removedImageUrls")) },
-                new Object[] { ProductVariantDeletedMessage.builder().staged(true) } };
+                new Object[] { "variant",
+                        ProductVariantDeletedMessage.builder()
+                                .variant(new com.commercetools.api.models.product.ProductVariantImpl()) },
+                new Object[] { "removedImageUrls",
+                        ProductVariantDeletedMessage.builder()
+                                .removedImageUrls(Collections.singletonList("removedImageUrls")) },
+                new Object[] { "staged", ProductVariantDeletedMessage.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringAddedMessagePayloadTest.java
index 72784bedac0..938ecaca12e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringAddedMessagePayloadTest.java
@@ -1,39 +1,34 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantTailoringAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantTailoringAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantTailoringAddedMessagePayloadBuilder builder) {
         ProductVariantTailoringAddedMessagePayload productVariantTailoringAddedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productVariantTailoringAddedMessagePayload)
                 .isInstanceOf(ProductVariantTailoringAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductVariantTailoringAddedMessagePayload.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductVariantTailoringAddedMessagePayload.builder().productKey("productKey") },
-                new Object[] { ProductVariantTailoringAddedMessagePayload.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductVariantTailoringAddedMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductVariantTailoringAddedMessagePayload.builder()
+                new Object[] { "store",
+                        ProductVariantTailoringAddedMessagePayload.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey",
+                        ProductVariantTailoringAddedMessagePayload.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductVariantTailoringAddedMessagePayload.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantId", ProductVariantTailoringAddedMessagePayload.builder().variantId(5L) },
+                new Object[] { "variant", ProductVariantTailoringAddedMessagePayload.builder()
                         .variant(new com.commercetools.api.models.product_tailoring.ProductVariantTailoringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringAddedMessageTest.java
index 35ce785be12..d7b75782f04 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringAddedMessageTest.java
@@ -1,38 +1,32 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantTailoringAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantTailoringAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantTailoringAddedMessageBuilder builder) {
         ProductVariantTailoringAddedMessage productVariantTailoringAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(productVariantTailoringAddedMessage)
                 .isInstanceOf(ProductVariantTailoringAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductVariantTailoringAddedMessage.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductVariantTailoringAddedMessage.builder().productKey("productKey") },
-                new Object[] { ProductVariantTailoringAddedMessage.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductVariantTailoringAddedMessage.builder().variantId(5L) },
-                new Object[] { ProductVariantTailoringAddedMessage.builder()
+                new Object[] { "store",
+                        ProductVariantTailoringAddedMessage.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductVariantTailoringAddedMessage.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductVariantTailoringAddedMessage.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantId", ProductVariantTailoringAddedMessage.builder().variantId(5L) },
+                new Object[] { "variant", ProductVariantTailoringAddedMessage.builder()
                         .variant(new com.commercetools.api.models.product_tailoring.ProductVariantTailoringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringRemovedMessagePayloadTest.java
index 068b8ee0987..8aecc1ad077 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringRemovedMessagePayloadTest.java
@@ -1,39 +1,34 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantTailoringRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantTailoringRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantTailoringRemovedMessagePayloadBuilder builder) {
         ProductVariantTailoringRemovedMessagePayload productVariantTailoringRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(productVariantTailoringRemovedMessagePayload)
                 .isInstanceOf(ProductVariantTailoringRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductVariantTailoringRemovedMessagePayload.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductVariantTailoringRemovedMessagePayload.builder().productKey("productKey") },
-                new Object[] { ProductVariantTailoringRemovedMessagePayload.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductVariantTailoringRemovedMessagePayload.builder().variantId(5L) },
-                new Object[] { ProductVariantTailoringRemovedMessagePayload.builder()
+                new Object[] { "store",
+                        ProductVariantTailoringRemovedMessagePayload.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey",
+                        ProductVariantTailoringRemovedMessagePayload.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductVariantTailoringRemovedMessagePayload.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantId", ProductVariantTailoringRemovedMessagePayload.builder().variantId(5L) },
+                new Object[] { "variant", ProductVariantTailoringRemovedMessagePayload.builder()
                         .variant(new com.commercetools.api.models.product_tailoring.ProductVariantTailoringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringRemovedMessageTest.java
index a801c7a14be..c47ce4da7ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ProductVariantTailoringRemovedMessageTest.java
@@ -1,38 +1,32 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantTailoringRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantTailoringRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantTailoringRemovedMessageBuilder builder) {
         ProductVariantTailoringRemovedMessage productVariantTailoringRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(productVariantTailoringRemovedMessage)
                 .isInstanceOf(ProductVariantTailoringRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductVariantTailoringRemovedMessage.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductVariantTailoringRemovedMessage.builder().productKey("productKey") },
-                new Object[] { ProductVariantTailoringRemovedMessage.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductVariantTailoringRemovedMessage.builder().variantId(5L) },
-                new Object[] { ProductVariantTailoringRemovedMessage.builder()
+                new Object[] { "store",
+                        ProductVariantTailoringRemovedMessage.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "productKey", ProductVariantTailoringRemovedMessage.builder().productKey("productKey") },
+                new Object[] { "product",
+                        ProductVariantTailoringRemovedMessage.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantId", ProductVariantTailoringRemovedMessage.builder().variantId(5L) },
+                new Object[] { "variant", ProductVariantTailoringRemovedMessage.builder()
                         .variant(new com.commercetools.api.models.product_tailoring.ProductVariantTailoringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCreatedMessagePayloadTest.java
index 491d30c03c6..888df3205d2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteCreatedMessagePayloadBuilder builder) {
         QuoteCreatedMessagePayload quoteCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(quoteCreatedMessagePayload).isInstanceOf(QuoteCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "quote",
                 QuoteCreatedMessagePayload.builder().quote(new com.commercetools.api.models.quote.QuoteImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCreatedMessageTest.java
index 7fc54a66fdf..0b40d0be472 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteCreatedMessageBuilder builder) {
         QuoteCreatedMessage quoteCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(quoteCreatedMessage).isInstanceOf(QuoteCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "quote",
                 QuoteCreatedMessage.builder().quote(new com.commercetools.api.models.quote.QuoteImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCustomerChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCustomerChangedMessagePayloadTest.java
index 64a1d713752..42c5241b12f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCustomerChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCustomerChangedMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteCustomerChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteCustomerChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteCustomerChangedMessagePayloadBuilder builder) {
         QuoteCustomerChangedMessagePayload quoteCustomerChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(quoteCustomerChangedMessagePayload)
                 .isInstanceOf(QuoteCustomerChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteCustomerChangedMessagePayload.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { QuoteCustomerChangedMessagePayload.builder()
+                new Object[] { "customer",
+                        QuoteCustomerChangedMessagePayload.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "previousCustomer", QuoteCustomerChangedMessagePayload.builder()
                         .previousCustomer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCustomerChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCustomerChangedMessageTest.java
index 0fe2d2bc7ac..04974414783 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCustomerChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteCustomerChangedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteCustomerChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteCustomerChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteCustomerChangedMessageBuilder builder) {
         QuoteCustomerChangedMessage quoteCustomerChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(quoteCustomerChangedMessage).isInstanceOf(QuoteCustomerChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteCustomerChangedMessage.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { QuoteCustomerChangedMessage.builder()
+                new Object[] { "customer",
+                        QuoteCustomerChangedMessage.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "previousCustomer", QuoteCustomerChangedMessage.builder()
                         .previousCustomer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteDeletedMessagePayloadTest.java
index bbf61b77d6d..caf4cbf2c52 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteDeletedMessagePayloadTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteDeletedMessagePayloadTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteDeletedMessageTest.java
index fcd0c6169b9..01479348073 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteDeletedMessageTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteDeletedMessageTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRenegotiationRequestedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRenegotiationRequestedMessagePayloadTest.java
index 4c83e94a840..104184d4b92 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRenegotiationRequestedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRenegotiationRequestedMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRenegotiationRequestedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRenegotiationRequestedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRenegotiationRequestedMessagePayloadBuilder builder) {
         QuoteRenegotiationRequestedMessagePayload quoteRenegotiationRequestedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(quoteRenegotiationRequestedMessagePayload)
                 .isInstanceOf(QuoteRenegotiationRequestedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { QuoteRenegotiationRequestedMessagePayload.builder().buyerComment("buyerComment") } };
+        return new Object[][] { new Object[] { "buyerComment",
+                QuoteRenegotiationRequestedMessagePayload.builder().buyerComment("buyerComment") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRenegotiationRequestedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRenegotiationRequestedMessageTest.java
index 4276d263599..06325bd7c60 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRenegotiationRequestedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRenegotiationRequestedMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRenegotiationRequestedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRenegotiationRequestedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRenegotiationRequestedMessageBuilder builder) {
         QuoteRenegotiationRequestedMessage quoteRenegotiationRequestedMessage = builder.buildUnchecked();
         Assertions.assertThat(quoteRenegotiationRequestedMessage)
                 .isInstanceOf(QuoteRenegotiationRequestedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { QuoteRenegotiationRequestedMessage.builder().buyerComment("buyerComment") } };
+        return new Object[][] { new Object[] { "buyerComment",
+                QuoteRenegotiationRequestedMessage.builder().buyerComment("buyerComment") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCreatedMessagePayloadTest.java
index 9b46a18a783..11a4b7f87f6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestCreatedMessagePayloadBuilder builder) {
         QuoteRequestCreatedMessagePayload quoteRequestCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestCreatedMessagePayload).isInstanceOf(QuoteRequestCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteRequestCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "quoteRequest", QuoteRequestCreatedMessagePayload.builder()
                 .quoteRequest(new com.commercetools.api.models.quote_request.QuoteRequestImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCreatedMessageTest.java
index d40643648ee..04040a7d4e0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestCreatedMessageBuilder builder) {
         QuoteRequestCreatedMessage quoteRequestCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestCreatedMessage).isInstanceOf(QuoteRequestCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteRequestCreatedMessage.builder()
+        return new Object[][] { new Object[] { "quoteRequest", QuoteRequestCreatedMessage.builder()
                 .quoteRequest(new com.commercetools.api.models.quote_request.QuoteRequestImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCustomerChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCustomerChangedMessagePayloadTest.java
index 2c4e9284eed..10fc7a3f8a3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCustomerChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCustomerChangedMessagePayloadTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestCustomerChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestCustomerChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestCustomerChangedMessagePayloadBuilder builder) {
         QuoteRequestCustomerChangedMessagePayload quoteRequestCustomerChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestCustomerChangedMessagePayload)
                 .isInstanceOf(QuoteRequestCustomerChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteRequestCustomerChangedMessagePayload.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { QuoteRequestCustomerChangedMessagePayload.builder()
+                new Object[] { "customer",
+                        QuoteRequestCustomerChangedMessagePayload.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "previousCustomer", QuoteRequestCustomerChangedMessagePayload.builder()
                         .previousCustomer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCustomerChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCustomerChangedMessageTest.java
index bf6e386fc6f..58c2d9cc65e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCustomerChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestCustomerChangedMessageTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestCustomerChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestCustomerChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestCustomerChangedMessageBuilder builder) {
         QuoteRequestCustomerChangedMessage quoteRequestCustomerChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestCustomerChangedMessage)
                 .isInstanceOf(QuoteRequestCustomerChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteRequestCustomerChangedMessage.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { QuoteRequestCustomerChangedMessage.builder()
+                new Object[] { "customer",
+                        QuoteRequestCustomerChangedMessage.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "previousCustomer", QuoteRequestCustomerChangedMessage.builder()
                         .previousCustomer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestDeletedMessagePayloadTest.java
index c065f4daa26..ab0845d3fad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestDeletedMessagePayloadTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestDeletedMessagePayloadTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestDeletedMessageTest.java
index 41bf9be02cb..2db4129b377 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestDeletedMessageTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestDeletedMessageTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateChangedMessagePayloadTest.java
index ca7faf90a07..33971197fe6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateChangedMessagePayloadTest.java
@@ -1,36 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestStateChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestStateChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestStateChangedMessagePayloadBuilder builder) {
         QuoteRequestStateChangedMessagePayload quoteRequestStateChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestStateChangedMessagePayload)
                 .isInstanceOf(QuoteRequestStateChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "quoteRequestState",
                         QuoteRequestStateChangedMessagePayload.builder()
                                 .quoteRequestState(com.commercetools.api.models.quote_request.QuoteRequestState
                                         .findEnum("Submitted")) },
-                new Object[] { QuoteRequestStateChangedMessagePayload.builder()
+                new Object[] { "oldQuoteRequestState", QuoteRequestStateChangedMessagePayload.builder()
                         .oldQuoteRequestState(
                             com.commercetools.api.models.quote_request.QuoteRequestState.findEnum("Submitted")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateChangedMessageTest.java
index a175908b2cf..2782ff3502d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateChangedMessageTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestStateChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestStateChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestStateChangedMessageBuilder builder) {
         QuoteRequestStateChangedMessage quoteRequestStateChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestStateChangedMessage).isInstanceOf(QuoteRequestStateChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "quoteRequestState",
                         QuoteRequestStateChangedMessage.builder()
                                 .quoteRequestState(com.commercetools.api.models.quote_request.QuoteRequestState
                                         .findEnum("Submitted")) },
-                new Object[] { QuoteRequestStateChangedMessage.builder()
+                new Object[] { "oldQuoteRequestState", QuoteRequestStateChangedMessage.builder()
                         .oldQuoteRequestState(
                             com.commercetools.api.models.quote_request.QuoteRequestState.findEnum("Submitted")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateTransitionMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateTransitionMessagePayloadTest.java
index b020da602b2..4ed6c44130b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateTransitionMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateTransitionMessagePayloadTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestStateTransitionMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestStateTransitionMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestStateTransitionMessagePayloadBuilder builder) {
         QuoteRequestStateTransitionMessagePayload quoteRequestStateTransitionMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestStateTransitionMessagePayload)
                 .isInstanceOf(QuoteRequestStateTransitionMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteRequestStateTransitionMessagePayload.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { QuoteRequestStateTransitionMessagePayload.builder()
-                        .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { QuoteRequestStateTransitionMessagePayload.builder().force(true) } };
+                new Object[] { "state",
+                        QuoteRequestStateTransitionMessagePayload.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "oldState",
+                        QuoteRequestStateTransitionMessagePayload.builder()
+                                .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "force", QuoteRequestStateTransitionMessagePayload.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateTransitionMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateTransitionMessageTest.java
index c26715d5d5c..109026f35f7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateTransitionMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteRequestStateTransitionMessageTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestStateTransitionMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestStateTransitionMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestStateTransitionMessageBuilder builder) {
         QuoteRequestStateTransitionMessage quoteRequestStateTransitionMessage = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestStateTransitionMessage)
                 .isInstanceOf(QuoteRequestStateTransitionMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteRequestStateTransitionMessage.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { QuoteRequestStateTransitionMessage.builder()
-                        .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { QuoteRequestStateTransitionMessage.builder().force(true) } };
+                new Object[] { "state",
+                        QuoteRequestStateTransitionMessage.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "oldState",
+                        QuoteRequestStateTransitionMessage.builder()
+                                .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "force", QuoteRequestStateTransitionMessage.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateChangedMessagePayloadTest.java
index d0487df4a54..cf7ff7e96e2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateChangedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteStateChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteStateChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteStateChangedMessagePayloadBuilder builder) {
         QuoteStateChangedMessagePayload quoteStateChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(quoteStateChangedMessagePayload).isInstanceOf(QuoteStateChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteStateChangedMessagePayload.builder()
-                        .quoteState(com.commercetools.api.models.quote.QuoteState.findEnum("Pending")) },
-                new Object[] { QuoteStateChangedMessagePayload.builder()
+                new Object[] { "quoteState",
+                        QuoteStateChangedMessagePayload.builder()
+                                .quoteState(com.commercetools.api.models.quote.QuoteState.findEnum("Pending")) },
+                new Object[] { "oldQuoteState", QuoteStateChangedMessagePayload.builder()
                         .oldQuoteState(com.commercetools.api.models.quote.QuoteState.findEnum("Pending")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateChangedMessageTest.java
index 7d50848170f..57da86cd755 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateChangedMessageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteStateChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteStateChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteStateChangedMessageBuilder builder) {
         QuoteStateChangedMessage quoteStateChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(quoteStateChangedMessage).isInstanceOf(QuoteStateChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteStateChangedMessage.builder()
-                        .quoteState(com.commercetools.api.models.quote.QuoteState.findEnum("Pending")) },
-                new Object[] { QuoteStateChangedMessage.builder()
+                new Object[] { "quoteState",
+                        QuoteStateChangedMessage.builder()
+                                .quoteState(com.commercetools.api.models.quote.QuoteState.findEnum("Pending")) },
+                new Object[] { "oldQuoteState", QuoteStateChangedMessage.builder()
                         .oldQuoteState(com.commercetools.api.models.quote.QuoteState.findEnum("Pending")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateTransitionMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateTransitionMessagePayloadTest.java
index cba08e7598c..2f757d1a981 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateTransitionMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateTransitionMessagePayloadTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteStateTransitionMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteStateTransitionMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteStateTransitionMessagePayloadBuilder builder) {
         QuoteStateTransitionMessagePayload quoteStateTransitionMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(quoteStateTransitionMessagePayload)
                 .isInstanceOf(QuoteStateTransitionMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteStateTransitionMessagePayload.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { QuoteStateTransitionMessagePayload.builder()
-                        .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { QuoteStateTransitionMessagePayload.builder().force(true) } };
+                new Object[] { "state",
+                        QuoteStateTransitionMessagePayload.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "oldState",
+                        QuoteStateTransitionMessagePayload.builder()
+                                .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "force", QuoteStateTransitionMessagePayload.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateTransitionMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateTransitionMessageTest.java
index 0625dd68171..09d7538fe22 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateTransitionMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/QuoteStateTransitionMessageTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteStateTransitionMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteStateTransitionMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteStateTransitionMessageBuilder builder) {
         QuoteStateTransitionMessage quoteStateTransitionMessage = builder.buildUnchecked();
         Assertions.assertThat(quoteStateTransitionMessage).isInstanceOf(QuoteStateTransitionMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteStateTransitionMessage.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { QuoteStateTransitionMessage.builder()
-                        .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { QuoteStateTransitionMessage.builder().force(true) } };
+                new Object[] { "state",
+                        QuoteStateTransitionMessage.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "oldState",
+                        QuoteStateTransitionMessage.builder()
+                                .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "force", QuoteStateTransitionMessage.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoAddedMessagePayloadTest.java
index 84673eb518a..97f2e8dad9a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoAddedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReturnInfoAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReturnInfoAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReturnInfoAddedMessagePayloadBuilder builder) {
         ReturnInfoAddedMessagePayload returnInfoAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(returnInfoAddedMessagePayload).isInstanceOf(ReturnInfoAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReturnInfoAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "returnInfo", ReturnInfoAddedMessagePayload.builder()
                 .returnInfo(new com.commercetools.api.models.order.ReturnInfoImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoAddedMessageTest.java
index 948b6d9ffd9..b72fdfda0fd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReturnInfoAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReturnInfoAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReturnInfoAddedMessageBuilder builder) {
         ReturnInfoAddedMessage returnInfoAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(returnInfoAddedMessage).isInstanceOf(ReturnInfoAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReturnInfoAddedMessage.builder()
+        return new Object[][] { new Object[] { "returnInfo", ReturnInfoAddedMessage.builder()
                 .returnInfo(new com.commercetools.api.models.order.ReturnInfoImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoSetMessagePayloadTest.java
index a7ea93b1bd4..8f6c73b406c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoSetMessagePayloadTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReturnInfoSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReturnInfoSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReturnInfoSetMessagePayloadBuilder builder) {
         ReturnInfoSetMessagePayload returnInfoSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(returnInfoSetMessagePayload).isInstanceOf(ReturnInfoSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReturnInfoSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "returnInfo", ReturnInfoSetMessagePayload.builder()
                 .returnInfo(Collections.singletonList(new com.commercetools.api.models.order.ReturnInfoImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoSetMessageTest.java
index 6da402b8c9a..4bef4cb4db9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReturnInfoSetMessageTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReturnInfoSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReturnInfoSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReturnInfoSetMessageBuilder builder) {
         ReturnInfoSetMessage returnInfoSetMessage = builder.buildUnchecked();
         Assertions.assertThat(returnInfoSetMessage).isInstanceOf(ReturnInfoSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReturnInfoSetMessage.builder()
+        return new Object[][] { new Object[] { "returnInfo", ReturnInfoSetMessage.builder()
                 .returnInfo(Collections.singletonList(new com.commercetools.api.models.order.ReturnInfoImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewCreatedMessagePayloadTest.java
index c3807edaa24..349d83e6869 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewCreatedMessagePayloadBuilder builder) {
         ReviewCreatedMessagePayload reviewCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(reviewCreatedMessagePayload).isInstanceOf(ReviewCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "review",
                 ReviewCreatedMessagePayload.builder().review(new com.commercetools.api.models.review.ReviewImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewCreatedMessageTest.java
index 98831be3e25..8ef2d4c169a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewCreatedMessageBuilder builder) {
         ReviewCreatedMessage reviewCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(reviewCreatedMessage).isInstanceOf(ReviewCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "review",
                 ReviewCreatedMessage.builder().review(new com.commercetools.api.models.review.ReviewImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewRatingSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewRatingSetMessagePayloadTest.java
index 744fd978499..ba38a7c0c36 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewRatingSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewRatingSetMessagePayloadTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewRatingSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewRatingSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewRatingSetMessagePayloadBuilder builder) {
         ReviewRatingSetMessagePayload reviewRatingSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(reviewRatingSetMessagePayload).isInstanceOf(ReviewRatingSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewRatingSetMessagePayload.builder().oldRating(0.9492049) },
-                new Object[] { ReviewRatingSetMessagePayload.builder().newRating(0.33994043) },
-                new Object[] { ReviewRatingSetMessagePayload.builder().includedInStatistics(true) },
-                new Object[] { ReviewRatingSetMessagePayload.builder()
+        return new Object[][] {
+                new Object[] { "oldRating", ReviewRatingSetMessagePayload.builder().oldRating(0.9492049) },
+                new Object[] { "newRating", ReviewRatingSetMessagePayload.builder().newRating(0.33994043) },
+                new Object[] { "includedInStatistics",
+                        ReviewRatingSetMessagePayload.builder().includedInStatistics(true) },
+                new Object[] { "target", ReviewRatingSetMessagePayload.builder()
                         .target(new com.commercetools.api.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewRatingSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewRatingSetMessageTest.java
index 9eded66ab3f..7973f6c403a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewRatingSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewRatingSetMessageTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewRatingSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewRatingSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewRatingSetMessageBuilder builder) {
         ReviewRatingSetMessage reviewRatingSetMessage = builder.buildUnchecked();
         Assertions.assertThat(reviewRatingSetMessage).isInstanceOf(ReviewRatingSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewRatingSetMessage.builder().oldRating(0.9492049) },
-                new Object[] { ReviewRatingSetMessage.builder().newRating(0.33994043) },
-                new Object[] { ReviewRatingSetMessage.builder().includedInStatistics(true) },
-                new Object[] { ReviewRatingSetMessage.builder()
+        return new Object[][] { new Object[] { "oldRating", ReviewRatingSetMessage.builder().oldRating(0.9492049) },
+                new Object[] { "newRating", ReviewRatingSetMessage.builder().newRating(0.33994043) },
+                new Object[] { "includedInStatistics", ReviewRatingSetMessage.builder().includedInStatistics(true) },
+                new Object[] { "target", ReviewRatingSetMessage.builder()
                         .target(new com.commercetools.api.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewStateTransitionMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewStateTransitionMessagePayloadTest.java
index 7329ede63aa..8154df62dc7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewStateTransitionMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewStateTransitionMessagePayloadTest.java
@@ -1,40 +1,37 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewStateTransitionMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewStateTransitionMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewStateTransitionMessagePayloadBuilder builder) {
         ReviewStateTransitionMessagePayload reviewStateTransitionMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(reviewStateTransitionMessagePayload)
                 .isInstanceOf(ReviewStateTransitionMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ReviewStateTransitionMessagePayload.builder()
-                        .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { ReviewStateTransitionMessagePayload.builder()
-                        .newState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { ReviewStateTransitionMessagePayload.builder().oldIncludedInStatistics(true) },
-                new Object[] { ReviewStateTransitionMessagePayload.builder().newIncludedInStatistics(true) },
-                new Object[] { ReviewStateTransitionMessagePayload.builder()
-                        .target(new com.commercetools.api.models.common.ReferenceImpl()) },
-                new Object[] { ReviewStateTransitionMessagePayload.builder().force(true) } };
+                new Object[] { "oldState",
+                        ReviewStateTransitionMessagePayload.builder()
+                                .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "newState",
+                        ReviewStateTransitionMessagePayload.builder()
+                                .newState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "oldIncludedInStatistics",
+                        ReviewStateTransitionMessagePayload.builder().oldIncludedInStatistics(true) },
+                new Object[] { "newIncludedInStatistics",
+                        ReviewStateTransitionMessagePayload.builder().newIncludedInStatistics(true) },
+                new Object[] { "target",
+                        ReviewStateTransitionMessagePayload.builder()
+                                .target(new com.commercetools.api.models.common.ReferenceImpl()) },
+                new Object[] { "force", ReviewStateTransitionMessagePayload.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewStateTransitionMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewStateTransitionMessageTest.java
index ac4c5d9f3bd..52ba13957d6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewStateTransitionMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ReviewStateTransitionMessageTest.java
@@ -1,39 +1,36 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewStateTransitionMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewStateTransitionMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewStateTransitionMessageBuilder builder) {
         ReviewStateTransitionMessage reviewStateTransitionMessage = builder.buildUnchecked();
         Assertions.assertThat(reviewStateTransitionMessage).isInstanceOf(ReviewStateTransitionMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ReviewStateTransitionMessage.builder()
-                        .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { ReviewStateTransitionMessage.builder()
-                        .newState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { ReviewStateTransitionMessage.builder().oldIncludedInStatistics(true) },
-                new Object[] { ReviewStateTransitionMessage.builder().newIncludedInStatistics(true) },
-                new Object[] { ReviewStateTransitionMessage.builder()
-                        .target(new com.commercetools.api.models.common.ReferenceImpl()) },
-                new Object[] { ReviewStateTransitionMessage.builder().force(true) } };
+                new Object[] { "oldState",
+                        ReviewStateTransitionMessage.builder()
+                                .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "newState",
+                        ReviewStateTransitionMessage.builder()
+                                .newState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "oldIncludedInStatistics",
+                        ReviewStateTransitionMessage.builder().oldIncludedInStatistics(true) },
+                new Object[] { "newIncludedInStatistics",
+                        ReviewStateTransitionMessage.builder().newIncludedInStatistics(true) },
+                new Object[] { "target",
+                        ReviewStateTransitionMessage.builder()
+                                .target(new com.commercetools.api.models.common.ReferenceImpl()) },
+                new Object[] { "force", ReviewStateTransitionMessage.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemAddedMessagePayloadTest.java
index c4b9f5e8407..3c38daf199c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemAddedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListLineItemAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListLineItemAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListLineItemAddedMessagePayloadBuilder builder) {
         ShoppingListLineItemAddedMessagePayload shoppingListLineItemAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(shoppingListLineItemAddedMessagePayload)
                 .isInstanceOf(ShoppingListLineItemAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListLineItemAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "lineItem", ShoppingListLineItemAddedMessagePayload.builder()
                 .lineItem(new com.commercetools.api.models.shopping_list.ShoppingListLineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemAddedMessageTest.java
index d8892af665d..97afa64da98 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListLineItemAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListLineItemAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListLineItemAddedMessageBuilder builder) {
         ShoppingListLineItemAddedMessage shoppingListLineItemAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(shoppingListLineItemAddedMessage).isInstanceOf(ShoppingListLineItemAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListLineItemAddedMessage.builder()
+        return new Object[][] { new Object[] { "lineItem", ShoppingListLineItemAddedMessage.builder()
                 .lineItem(new com.commercetools.api.models.shopping_list.ShoppingListLineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemRemovedMessagePayloadTest.java
index 02c10a68e47..8f8a8059610 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemRemovedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListLineItemRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListLineItemRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListLineItemRemovedMessagePayloadBuilder builder) {
         ShoppingListLineItemRemovedMessagePayload shoppingListLineItemRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(shoppingListLineItemRemovedMessagePayload)
                 .isInstanceOf(ShoppingListLineItemRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListLineItemRemovedMessagePayload.builder()
+        return new Object[][] { new Object[] { "lineItem", ShoppingListLineItemRemovedMessagePayload.builder()
                 .lineItem(new com.commercetools.api.models.shopping_list.ShoppingListLineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemRemovedMessageTest.java
index 14dc80a96c5..9bee539bd15 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListLineItemRemovedMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListLineItemRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListLineItemRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListLineItemRemovedMessageBuilder builder) {
         ShoppingListLineItemRemovedMessage shoppingListLineItemRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(shoppingListLineItemRemovedMessage)
                 .isInstanceOf(ShoppingListLineItemRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListLineItemRemovedMessage.builder()
+        return new Object[][] { new Object[] { "lineItem", ShoppingListLineItemRemovedMessage.builder()
                 .lineItem(new com.commercetools.api.models.shopping_list.ShoppingListLineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListStoreSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListStoreSetMessagePayloadTest.java
index 2d17929a620..2f398bee1cc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListStoreSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/ShoppingListStoreSetMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListStoreSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListStoreSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListStoreSetMessagePayloadBuilder builder) {
         ShoppingListStoreSetMessagePayload shoppingListStoreSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(shoppingListStoreSetMessagePayload)
                 .isInstanceOf(ShoppingListStoreSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListStoreSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "store", ShoppingListStoreSetMessagePayload.builder()
                 .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteCreatedMessagePayloadTest.java
index 9bb92503907..2d89d334023 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteCreatedMessagePayloadTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteCreatedMessagePayloadBuilder builder) {
         StagedQuoteCreatedMessagePayload stagedQuoteCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteCreatedMessagePayload).isInstanceOf(StagedQuoteCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedQuoteCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "stagedQuote", StagedQuoteCreatedMessagePayload.builder()
                 .stagedQuote(new com.commercetools.api.models.staged_quote.StagedQuoteImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteCreatedMessageTest.java
index 44d38fab2a5..d43c8e3fbd2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteCreatedMessageBuilder builder) {
         StagedQuoteCreatedMessage stagedQuoteCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteCreatedMessage).isInstanceOf(StagedQuoteCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedQuoteCreatedMessage.builder()
+        return new Object[][] { new Object[] { "stagedQuote", StagedQuoteCreatedMessage.builder()
                 .stagedQuote(new com.commercetools.api.models.staged_quote.StagedQuoteImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteDeletedMessagePayloadTest.java
index 86951ed7638..449f3fc38e6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteDeletedMessagePayloadTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteDeletedMessagePayloadTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteDeletedMessageTest.java
index 9faf599d0c5..e728e49d99f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteDeletedMessageTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteDeletedMessageTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteSellerCommentSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteSellerCommentSetMessagePayloadTest.java
index 3e5bd06dd6a..68ad34238cd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteSellerCommentSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteSellerCommentSetMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteSellerCommentSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteSellerCommentSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteSellerCommentSetMessagePayloadBuilder builder) {
         StagedQuoteSellerCommentSetMessagePayload stagedQuoteSellerCommentSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteSellerCommentSetMessagePayload)
                 .isInstanceOf(StagedQuoteSellerCommentSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { StagedQuoteSellerCommentSetMessagePayload.builder().sellerComment("sellerComment") } };
+        return new Object[][] { new Object[] { "sellerComment",
+                StagedQuoteSellerCommentSetMessagePayload.builder().sellerComment("sellerComment") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteSellerCommentSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteSellerCommentSetMessageTest.java
index 5155be67238..7ed080c8275 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteSellerCommentSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteSellerCommentSetMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteSellerCommentSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteSellerCommentSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteSellerCommentSetMessageBuilder builder) {
         StagedQuoteSellerCommentSetMessage stagedQuoteSellerCommentSetMessage = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteSellerCommentSetMessage)
                 .isInstanceOf(StagedQuoteSellerCommentSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { StagedQuoteSellerCommentSetMessage.builder().sellerComment("sellerComment") } };
+        return new Object[][] { new Object[] { "sellerComment",
+                StagedQuoteSellerCommentSetMessage.builder().sellerComment("sellerComment") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateChangedMessagePayloadTest.java
index 28a901b4eea..079ce52dabf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateChangedMessagePayloadTest.java
@@ -1,36 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteStateChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteStateChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteStateChangedMessagePayloadBuilder builder) {
         StagedQuoteStateChangedMessagePayload stagedQuoteStateChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteStateChangedMessagePayload)
                 .isInstanceOf(StagedQuoteStateChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "stagedQuoteState",
                         StagedQuoteStateChangedMessagePayload.builder()
                                 .stagedQuoteState(com.commercetools.api.models.staged_quote.StagedQuoteState
                                         .findEnum("InProgress")) },
-                new Object[] { StagedQuoteStateChangedMessagePayload.builder()
+                new Object[] { "oldStagedQuoteState", StagedQuoteStateChangedMessagePayload.builder()
                         .oldStagedQuoteState(
                             com.commercetools.api.models.staged_quote.StagedQuoteState.findEnum("InProgress")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateChangedMessageTest.java
index 7c26366659c..2feea4d1cab 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateChangedMessageTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteStateChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteStateChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteStateChangedMessageBuilder builder) {
         StagedQuoteStateChangedMessage stagedQuoteStateChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteStateChangedMessage).isInstanceOf(StagedQuoteStateChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "stagedQuoteState",
                         StagedQuoteStateChangedMessage.builder()
                                 .stagedQuoteState(com.commercetools.api.models.staged_quote.StagedQuoteState
                                         .findEnum("InProgress")) },
-                new Object[] { StagedQuoteStateChangedMessage.builder()
+                new Object[] { "oldStagedQuoteState", StagedQuoteStateChangedMessage.builder()
                         .oldStagedQuoteState(
                             com.commercetools.api.models.staged_quote.StagedQuoteState.findEnum("InProgress")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateTransitionMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateTransitionMessagePayloadTest.java
index 650f56521ba..40e27b3ea55 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateTransitionMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateTransitionMessagePayloadTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteStateTransitionMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteStateTransitionMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteStateTransitionMessagePayloadBuilder builder) {
         StagedQuoteStateTransitionMessagePayload stagedQuoteStateTransitionMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteStateTransitionMessagePayload)
                 .isInstanceOf(StagedQuoteStateTransitionMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedQuoteStateTransitionMessagePayload.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { StagedQuoteStateTransitionMessagePayload.builder()
-                        .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { StagedQuoteStateTransitionMessagePayload.builder().force(true) } };
+                new Object[] { "state",
+                        StagedQuoteStateTransitionMessagePayload.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "oldState",
+                        StagedQuoteStateTransitionMessagePayload.builder()
+                                .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "force", StagedQuoteStateTransitionMessagePayload.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateTransitionMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateTransitionMessageTest.java
index 0824a234d0c..445d2e53880 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateTransitionMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteStateTransitionMessageTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteStateTransitionMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteStateTransitionMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteStateTransitionMessageBuilder builder) {
         StagedQuoteStateTransitionMessage stagedQuoteStateTransitionMessage = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteStateTransitionMessage).isInstanceOf(StagedQuoteStateTransitionMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedQuoteStateTransitionMessage.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { StagedQuoteStateTransitionMessage.builder()
-                        .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { StagedQuoteStateTransitionMessage.builder().force(true) } };
+                new Object[] { "state",
+                        StagedQuoteStateTransitionMessage.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "oldState",
+                        StagedQuoteStateTransitionMessage.builder()
+                                .oldState(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "force", StagedQuoteStateTransitionMessage.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteValidToSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteValidToSetMessagePayloadTest.java
index add31b9f4f7..77aebda92c0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteValidToSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteValidToSetMessagePayloadTest.java
@@ -3,31 +3,23 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteValidToSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteValidToSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteValidToSetMessagePayloadBuilder builder) {
         StagedQuoteValidToSetMessagePayload stagedQuoteValidToSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteValidToSetMessagePayload)
                 .isInstanceOf(StagedQuoteValidToSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "validTo",
                 StagedQuoteValidToSetMessagePayload.builder().validTo(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteValidToSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteValidToSetMessageTest.java
index 319da5b9f15..f9e97530bbf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteValidToSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StagedQuoteValidToSetMessageTest.java
@@ -3,30 +3,22 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteValidToSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteValidToSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteValidToSetMessageBuilder builder) {
         StagedQuoteValidToSetMessage stagedQuoteValidToSetMessage = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteValidToSetMessage).isInstanceOf(StagedQuoteValidToSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "validTo",
                 StagedQuoteValidToSetMessage.builder().validTo(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceActiveChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceActiveChangedMessagePayloadTest.java
index 62bfe3aa263..11dc2789edd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceActiveChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceActiveChangedMessagePayloadTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceActiveChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceActiveChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceActiveChangedMessagePayloadBuilder builder) {
         StandalonePriceActiveChangedMessagePayload standalonePriceActiveChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(standalonePriceActiveChangedMessagePayload)
                 .isInstanceOf(StandalonePriceActiveChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceActiveChangedMessagePayload.builder().active(true) },
-                new Object[] { StandalonePriceActiveChangedMessagePayload.builder().oldActive(true) } };
+        return new Object[][] {
+                new Object[] { "active", StandalonePriceActiveChangedMessagePayload.builder().active(true) },
+                new Object[] { "oldActive", StandalonePriceActiveChangedMessagePayload.builder().oldActive(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceActiveChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceActiveChangedMessageTest.java
index c876e0c87ae..6f0dd7bc2fe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceActiveChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceActiveChangedMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceActiveChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceActiveChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceActiveChangedMessageBuilder builder) {
         StandalonePriceActiveChangedMessage standalonePriceActiveChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceActiveChangedMessage)
                 .isInstanceOf(StandalonePriceActiveChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceActiveChangedMessage.builder().active(true) },
-                new Object[] { StandalonePriceActiveChangedMessage.builder().oldActive(true) } };
+        return new Object[][] { new Object[] { "active", StandalonePriceActiveChangedMessage.builder().active(true) },
+                new Object[] { "oldActive", StandalonePriceActiveChangedMessage.builder().oldActive(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceCreatedMessagePayloadTest.java
index 105d2fed53e..3ff600c572a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceCreatedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceCreatedMessagePayloadBuilder builder) {
         StandalonePriceCreatedMessagePayload standalonePriceCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceCreatedMessagePayload)
                 .isInstanceOf(StandalonePriceCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceCreatedMessagePayload.builder()
+        return new Object[][] { new Object[] { "standalonePrice", StandalonePriceCreatedMessagePayload.builder()
                 .standalonePrice(new com.commercetools.api.models.standalone_price.StandalonePriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceCreatedMessageTest.java
index 635b4a26c88..18aed02b25f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceCreatedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceCreatedMessageBuilder builder) {
         StandalonePriceCreatedMessage standalonePriceCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceCreatedMessage).isInstanceOf(StandalonePriceCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceCreatedMessage.builder()
+        return new Object[][] { new Object[] { "standalonePrice", StandalonePriceCreatedMessage.builder()
                 .standalonePrice(new com.commercetools.api.models.standalone_price.StandalonePriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDeletedMessagePayloadTest.java
index 9a762542b52..3450ef18b41 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDeletedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceDeletedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceDeletedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceDeletedMessagePayloadBuilder builder) {
         StandalonePriceDeletedMessagePayload standalonePriceDeletedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceDeletedMessagePayload)
                 .isInstanceOf(StandalonePriceDeletedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceDeletedMessagePayload.builder().sku("sku") } };
+        return new Object[][] { new Object[] { "sku", StandalonePriceDeletedMessagePayload.builder().sku("sku") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDeletedMessageTest.java
index dda56550165..829c097b1ac 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDeletedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceDeletedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceDeletedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceDeletedMessageBuilder builder) {
         StandalonePriceDeletedMessage standalonePriceDeletedMessage = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceDeletedMessage).isInstanceOf(StandalonePriceDeletedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceDeletedMessage.builder().sku("sku") } };
+        return new Object[][] { new Object[] { "sku", StandalonePriceDeletedMessage.builder().sku("sku") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDiscountSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDiscountSetMessagePayloadTest.java
index dd28c64fdbf..c4a7521c76b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDiscountSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDiscountSetMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceDiscountSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceDiscountSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceDiscountSetMessagePayloadBuilder builder) {
         StandalonePriceDiscountSetMessagePayload standalonePriceDiscountSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceDiscountSetMessagePayload)
                 .isInstanceOf(StandalonePriceDiscountSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceDiscountSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "discounted", StandalonePriceDiscountSetMessagePayload.builder()
                 .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDiscountSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDiscountSetMessageTest.java
index b999b5f99fb..f08399f48f3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDiscountSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceDiscountSetMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceDiscountSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceDiscountSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceDiscountSetMessageBuilder builder) {
         StandalonePriceDiscountSetMessage standalonePriceDiscountSetMessage = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceDiscountSetMessage).isInstanceOf(StandalonePriceDiscountSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceDiscountSetMessage.builder()
+        return new Object[][] { new Object[] { "discounted", StandalonePriceDiscountSetMessage.builder()
                 .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceExternalDiscountSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceExternalDiscountSetMessagePayloadTest.java
index 289edfb280a..95e8fd8d4ef 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceExternalDiscountSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceExternalDiscountSetMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceExternalDiscountSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceExternalDiscountSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceExternalDiscountSetMessagePayloadBuilder builder) {
         StandalonePriceExternalDiscountSetMessagePayload standalonePriceExternalDiscountSetMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(standalonePriceExternalDiscountSetMessagePayload)
                 .isInstanceOf(StandalonePriceExternalDiscountSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceExternalDiscountSetMessagePayload.builder()
+        return new Object[][] { new Object[] { "discounted", StandalonePriceExternalDiscountSetMessagePayload.builder()
                 .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceExternalDiscountSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceExternalDiscountSetMessageTest.java
index 935afcd55f8..28f6beff3cb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceExternalDiscountSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceExternalDiscountSetMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceExternalDiscountSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceExternalDiscountSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceExternalDiscountSetMessageBuilder builder) {
         StandalonePriceExternalDiscountSetMessage standalonePriceExternalDiscountSetMessage = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceExternalDiscountSetMessage)
                 .isInstanceOf(StandalonePriceExternalDiscountSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceExternalDiscountSetMessage.builder()
+        return new Object[][] { new Object[] { "discounted", StandalonePriceExternalDiscountSetMessage.builder()
                 .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceKeySetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceKeySetMessagePayloadTest.java
index 6b9501ca64a..fe98a763346 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceKeySetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceKeySetMessagePayloadTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceKeySetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceKeySetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceKeySetMessagePayloadBuilder builder) {
         StandalonePriceKeySetMessagePayload standalonePriceKeySetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceKeySetMessagePayload)
                 .isInstanceOf(StandalonePriceKeySetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceKeySetMessagePayload.builder().key("key") },
-                new Object[] { StandalonePriceKeySetMessagePayload.builder().oldKey("oldKey") } };
+        return new Object[][] { new Object[] { "key", StandalonePriceKeySetMessagePayload.builder().key("key") },
+                new Object[] { "oldKey", StandalonePriceKeySetMessagePayload.builder().oldKey("oldKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceKeySetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceKeySetMessageTest.java
index 3e7c1705b4b..4e274a58455 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceKeySetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceKeySetMessageTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceKeySetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceKeySetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceKeySetMessageBuilder builder) {
         StandalonePriceKeySetMessage standalonePriceKeySetMessage = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceKeySetMessage).isInstanceOf(StandalonePriceKeySetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceKeySetMessage.builder().key("key") },
-                new Object[] { StandalonePriceKeySetMessage.builder().oldKey("oldKey") } };
+        return new Object[][] { new Object[] { "key", StandalonePriceKeySetMessage.builder().key("key") },
+                new Object[] { "oldKey", StandalonePriceKeySetMessage.builder().oldKey("oldKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesAppliedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesAppliedMessagePayloadTest.java
index fe12ee6c073..94010ad0719 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesAppliedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesAppliedMessagePayloadTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceStagedChangesAppliedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceStagedChangesAppliedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceStagedChangesAppliedMessagePayloadBuilder builder) {
         StandalonePriceStagedChangesAppliedMessagePayload standalonePriceStagedChangesAppliedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(standalonePriceStagedChangesAppliedMessagePayload)
                 .isInstanceOf(StandalonePriceStagedChangesAppliedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceStagedChangesAppliedMessagePayload.builder()
-                .stagedChanges(new com.commercetools.api.models.standalone_price.StagedStandalonePriceImpl()) } };
+        return new Object[][] { new Object[] { "stagedChanges",
+                StandalonePriceStagedChangesAppliedMessagePayload.builder()
+                        .stagedChanges(
+                            new com.commercetools.api.models.standalone_price.StagedStandalonePriceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesAppliedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesAppliedMessageTest.java
index e55a36bfbe2..1f7e35f52e5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesAppliedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesAppliedMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceStagedChangesAppliedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceStagedChangesAppliedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceStagedChangesAppliedMessageBuilder builder) {
         StandalonePriceStagedChangesAppliedMessage standalonePriceStagedChangesAppliedMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(standalonePriceStagedChangesAppliedMessage)
                 .isInstanceOf(StandalonePriceStagedChangesAppliedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceStagedChangesAppliedMessage.builder()
+        return new Object[][] { new Object[] { "stagedChanges", StandalonePriceStagedChangesAppliedMessage.builder()
                 .stagedChanges(new com.commercetools.api.models.standalone_price.StagedStandalonePriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesRemovedMessagePayloadTest.java
index c173d6ae6ab..a368fa64fed 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesRemovedMessagePayloadTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceStagedChangesRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceStagedChangesRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceStagedChangesRemovedMessagePayloadBuilder builder) {
         StandalonePriceStagedChangesRemovedMessagePayload standalonePriceStagedChangesRemovedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(standalonePriceStagedChangesRemovedMessagePayload)
                 .isInstanceOf(StandalonePriceStagedChangesRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceStagedChangesRemovedMessagePayload.builder()
-                .stagedChanges(new com.commercetools.api.models.standalone_price.StagedStandalonePriceImpl()) } };
+        return new Object[][] { new Object[] { "stagedChanges",
+                StandalonePriceStagedChangesRemovedMessagePayload.builder()
+                        .stagedChanges(
+                            new com.commercetools.api.models.standalone_price.StagedStandalonePriceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesRemovedMessageTest.java
index cc9aafc84e9..22fe027050f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceStagedChangesRemovedMessageTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceStagedChangesRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceStagedChangesRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceStagedChangesRemovedMessageBuilder builder) {
         StandalonePriceStagedChangesRemovedMessage standalonePriceStagedChangesRemovedMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(standalonePriceStagedChangesRemovedMessage)
                 .isInstanceOf(StandalonePriceStagedChangesRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceStagedChangesRemovedMessage.builder()
+        return new Object[][] { new Object[] { "stagedChanges", StandalonePriceStagedChangesRemovedMessage.builder()
                 .stagedChanges(new com.commercetools.api.models.standalone_price.StagedStandalonePriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierAddedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierAddedMessagePayloadTest.java
index 84c77702a2e..10c628869eb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierAddedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierAddedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceTierAddedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceTierAddedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceTierAddedMessagePayloadBuilder builder) {
         StandalonePriceTierAddedMessagePayload standalonePriceTierAddedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceTierAddedMessagePayload)
                 .isInstanceOf(StandalonePriceTierAddedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceTierAddedMessagePayload.builder()
+        return new Object[][] { new Object[] { "tier", StandalonePriceTierAddedMessagePayload.builder()
                 .tier(new com.commercetools.api.models.common.PriceTierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierAddedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierAddedMessageTest.java
index 204d80012ec..e2b30958e4d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierAddedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierAddedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceTierAddedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceTierAddedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceTierAddedMessageBuilder builder) {
         StandalonePriceTierAddedMessage standalonePriceTierAddedMessage = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceTierAddedMessage).isInstanceOf(StandalonePriceTierAddedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceTierAddedMessage.builder()
+        return new Object[][] { new Object[] { "tier", StandalonePriceTierAddedMessage.builder()
                 .tier(new com.commercetools.api.models.common.PriceTierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierRemovedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierRemovedMessagePayloadTest.java
index 076650bc365..2ec3b226a24 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierRemovedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierRemovedMessagePayloadTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceTierRemovedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceTierRemovedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceTierRemovedMessagePayloadBuilder builder) {
         StandalonePriceTierRemovedMessagePayload standalonePriceTierRemovedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceTierRemovedMessagePayload)
                 .isInstanceOf(StandalonePriceTierRemovedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceTierRemovedMessagePayload.builder()
+        return new Object[][] { new Object[] { "removedTier", StandalonePriceTierRemovedMessagePayload.builder()
                 .removedTier(new com.commercetools.api.models.common.PriceTierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierRemovedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierRemovedMessageTest.java
index bb2587096b5..9822cc86c38 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierRemovedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTierRemovedMessageTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceTierRemovedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceTierRemovedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceTierRemovedMessageBuilder builder) {
         StandalonePriceTierRemovedMessage standalonePriceTierRemovedMessage = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceTierRemovedMessage).isInstanceOf(StandalonePriceTierRemovedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceTierRemovedMessage.builder()
+        return new Object[][] { new Object[] { "removedTier", StandalonePriceTierRemovedMessage.builder()
                 .removedTier(new com.commercetools.api.models.common.PriceTierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTiersSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTiersSetMessagePayloadTest.java
index b6db289e18e..6267aef886d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTiersSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTiersSetMessagePayloadTest.java
@@ -3,34 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceTiersSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceTiersSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceTiersSetMessagePayloadBuilder builder) {
         StandalonePriceTiersSetMessagePayload standalonePriceTiersSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceTiersSetMessagePayload)
                 .isInstanceOf(StandalonePriceTiersSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceTiersSetMessagePayload.builder()
-                        .tiers(Collections.singletonList(new com.commercetools.api.models.common.PriceTierImpl())) },
-                new Object[] { StandalonePriceTiersSetMessagePayload.builder()
+                new Object[] { "tiers",
+                        StandalonePriceTiersSetMessagePayload.builder()
+                                .tiers(Collections
+                                        .singletonList(new com.commercetools.api.models.common.PriceTierImpl())) },
+                new Object[] { "previousTiers", StandalonePriceTiersSetMessagePayload.builder()
                         .previousTiers(
                             Collections.singletonList(new com.commercetools.api.models.common.PriceTierImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTiersSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTiersSetMessageTest.java
index c969cfef470..e36263ffd78 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTiersSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceTiersSetMessageTest.java
@@ -3,33 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceTiersSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceTiersSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceTiersSetMessageBuilder builder) {
         StandalonePriceTiersSetMessage standalonePriceTiersSetMessage = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceTiersSetMessage).isInstanceOf(StandalonePriceTiersSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceTiersSetMessage.builder()
-                        .tiers(Collections.singletonList(new com.commercetools.api.models.common.PriceTierImpl())) },
-                new Object[] { StandalonePriceTiersSetMessage.builder()
+                new Object[] { "tiers",
+                        StandalonePriceTiersSetMessage.builder()
+                                .tiers(Collections
+                                        .singletonList(new com.commercetools.api.models.common.PriceTierImpl())) },
+                new Object[] { "previousTiers", StandalonePriceTiersSetMessage.builder()
                         .previousTiers(
                             Collections.singletonList(new com.commercetools.api.models.common.PriceTierImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromAndUntilSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromAndUntilSetMessagePayloadTest.java
index d5241dc6f3b..71ba1ff5f0a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromAndUntilSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromAndUntilSetMessagePayloadTest.java
@@ -3,39 +3,34 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceValidFromAndUntilSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceValidFromAndUntilSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceValidFromAndUntilSetMessagePayloadBuilder builder) {
         StandalonePriceValidFromAndUntilSetMessagePayload standalonePriceValidFromAndUntilSetMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(standalonePriceValidFromAndUntilSetMessagePayload)
                 .isInstanceOf(StandalonePriceValidFromAndUntilSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceValidFromAndUntilSetMessagePayload.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceValidFromAndUntilSetMessagePayload.builder()
-                        .previousValidFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceValidFromAndUntilSetMessagePayload.builder()
-                        .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceValidFromAndUntilSetMessagePayload.builder()
+                new Object[] { "validFrom",
+                        StandalonePriceValidFromAndUntilSetMessagePayload.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "previousValidFrom",
+                        StandalonePriceValidFromAndUntilSetMessagePayload.builder()
+                                .previousValidFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        StandalonePriceValidFromAndUntilSetMessagePayload.builder()
+                                .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "previousValidUntil", StandalonePriceValidFromAndUntilSetMessagePayload.builder()
                         .previousValidUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromAndUntilSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromAndUntilSetMessageTest.java
index 48bcca998fd..ad78bddff64 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromAndUntilSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromAndUntilSetMessageTest.java
@@ -3,39 +3,34 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceValidFromAndUntilSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceValidFromAndUntilSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceValidFromAndUntilSetMessageBuilder builder) {
         StandalonePriceValidFromAndUntilSetMessage standalonePriceValidFromAndUntilSetMessage = builder
                 .buildUnchecked();
         Assertions.assertThat(standalonePriceValidFromAndUntilSetMessage)
                 .isInstanceOf(StandalonePriceValidFromAndUntilSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceValidFromAndUntilSetMessage.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceValidFromAndUntilSetMessage.builder()
-                        .previousValidFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceValidFromAndUntilSetMessage.builder()
-                        .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceValidFromAndUntilSetMessage.builder()
+                new Object[] { "validFrom",
+                        StandalonePriceValidFromAndUntilSetMessage.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "previousValidFrom",
+                        StandalonePriceValidFromAndUntilSetMessage.builder()
+                                .previousValidFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        StandalonePriceValidFromAndUntilSetMessage.builder()
+                                .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "previousValidUntil", StandalonePriceValidFromAndUntilSetMessage.builder()
                         .previousValidUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromSetMessagePayloadTest.java
index cecc1155510..4d6ef00f3e5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromSetMessagePayloadTest.java
@@ -3,34 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceValidFromSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceValidFromSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceValidFromSetMessagePayloadBuilder builder) {
         StandalonePriceValidFromSetMessagePayload standalonePriceValidFromSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceValidFromSetMessagePayload)
                 .isInstanceOf(StandalonePriceValidFromSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceValidFromSetMessagePayload.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceValidFromSetMessagePayload.builder()
+                new Object[] { "validFrom",
+                        StandalonePriceValidFromSetMessagePayload.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "previousValidFrom", StandalonePriceValidFromSetMessagePayload.builder()
                         .previousValidFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromSetMessageTest.java
index 9ab281ab76c..ae782d2e5d0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidFromSetMessageTest.java
@@ -3,34 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceValidFromSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceValidFromSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceValidFromSetMessageBuilder builder) {
         StandalonePriceValidFromSetMessage standalonePriceValidFromSetMessage = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceValidFromSetMessage)
                 .isInstanceOf(StandalonePriceValidFromSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceValidFromSetMessage.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceValidFromSetMessage.builder()
+                new Object[] { "validFrom",
+                        StandalonePriceValidFromSetMessage.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "previousValidFrom", StandalonePriceValidFromSetMessage.builder()
                         .previousValidFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidUntilSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidUntilSetMessagePayloadTest.java
index b559f4716a9..bc3ecde7526 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidUntilSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidUntilSetMessagePayloadTest.java
@@ -3,35 +3,28 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceValidUntilSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceValidUntilSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceValidUntilSetMessagePayloadBuilder builder) {
         StandalonePriceValidUntilSetMessagePayload standalonePriceValidUntilSetMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(standalonePriceValidUntilSetMessagePayload)
                 .isInstanceOf(StandalonePriceValidUntilSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceValidUntilSetMessagePayload.builder()
-                        .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceValidUntilSetMessagePayload.builder()
+                new Object[] { "validUntil",
+                        StandalonePriceValidUntilSetMessagePayload.builder()
+                                .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "previousValidUntil", StandalonePriceValidUntilSetMessagePayload.builder()
                         .previousValidUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidUntilSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidUntilSetMessageTest.java
index 2ddb23f8f3b..23c64b2138f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidUntilSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValidUntilSetMessageTest.java
@@ -3,34 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceValidUntilSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceValidUntilSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceValidUntilSetMessageBuilder builder) {
         StandalonePriceValidUntilSetMessage standalonePriceValidUntilSetMessage = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceValidUntilSetMessage)
                 .isInstanceOf(StandalonePriceValidUntilSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceValidUntilSetMessage.builder()
-                        .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceValidUntilSetMessage.builder()
+                new Object[] { "validUntil",
+                        StandalonePriceValidUntilSetMessage.builder()
+                                .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "previousValidUntil", StandalonePriceValidUntilSetMessage.builder()
                         .previousValidUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValueChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValueChangedMessagePayloadTest.java
index 4eb80442398..1bd8c3da6af 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValueChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValueChangedMessagePayloadTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceValueChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceValueChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceValueChangedMessagePayloadBuilder builder) {
         StandalonePriceValueChangedMessagePayload standalonePriceValueChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceValueChangedMessagePayload)
                 .isInstanceOf(StandalonePriceValueChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceValueChangedMessagePayload.builder()
-                        .value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] { StandalonePriceValueChangedMessagePayload.builder().staged(true) },
-                new Object[] { StandalonePriceValueChangedMessagePayload.builder()
+                new Object[] { "value",
+                        StandalonePriceValueChangedMessagePayload.builder()
+                                .value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
+                new Object[] { "staged", StandalonePriceValueChangedMessagePayload.builder().staged(true) },
+                new Object[] { "oldValue", StandalonePriceValueChangedMessagePayload.builder()
                         .oldValue(new com.commercetools.api.models.common.TypedMoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValueChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValueChangedMessageTest.java
index 124a17c0af2..16395c51a98 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValueChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StandalonePriceValueChangedMessageTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceValueChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceValueChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceValueChangedMessageBuilder builder) {
         StandalonePriceValueChangedMessage standalonePriceValueChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceValueChangedMessage)
                 .isInstanceOf(StandalonePriceValueChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceValueChangedMessage.builder()
-                        .value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] { StandalonePriceValueChangedMessage.builder().staged(true) },
-                new Object[] { StandalonePriceValueChangedMessage.builder()
+                new Object[] { "value",
+                        StandalonePriceValueChangedMessage.builder()
+                                .value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
+                new Object[] { "staged", StandalonePriceValueChangedMessage.builder().staged(true) },
+                new Object[] { "oldValue", StandalonePriceValueChangedMessage.builder()
                         .oldValue(new com.commercetools.api.models.common.TypedMoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCountriesChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCountriesChangedMessagePayloadTest.java
index e5c2a98aa16..643f94f1a91 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCountriesChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCountriesChangedMessagePayloadTest.java
@@ -3,37 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreCountriesChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreCountriesChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreCountriesChangedMessagePayloadBuilder builder) {
         StoreCountriesChangedMessagePayload storeCountriesChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(storeCountriesChangedMessagePayload)
                 .isInstanceOf(StoreCountriesChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreCountriesChangedMessagePayload.builder()
-                        .addedCountries(Collections
-                                .singletonList(new com.commercetools.api.models.store_country.StoreCountryImpl())) },
-                new Object[] { StoreCountriesChangedMessagePayload.builder()
-                        .removedCountries(Collections
-                                .singletonList(new com.commercetools.api.models.store_country.StoreCountryImpl())) } };
+                new Object[] { "addedCountries",
+                        StoreCountriesChangedMessagePayload.builder()
+                                .addedCountries(Collections.singletonList(
+                                    new com.commercetools.api.models.store_country.StoreCountryImpl())) },
+                new Object[] { "removedCountries",
+                        StoreCountriesChangedMessagePayload.builder()
+                                .removedCountries(Collections.singletonList(
+                                    new com.commercetools.api.models.store_country.StoreCountryImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCountriesChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCountriesChangedMessageTest.java
index 38d91c51711..ff431d72d81 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCountriesChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCountriesChangedMessageTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreCountriesChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreCountriesChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreCountriesChangedMessageBuilder builder) {
         StoreCountriesChangedMessage storeCountriesChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(storeCountriesChangedMessage).isInstanceOf(StoreCountriesChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreCountriesChangedMessage.builder()
-                        .addedCountries(Collections
-                                .singletonList(new com.commercetools.api.models.store_country.StoreCountryImpl())) },
-                new Object[] { StoreCountriesChangedMessage.builder()
-                        .removedCountries(Collections
-                                .singletonList(new com.commercetools.api.models.store_country.StoreCountryImpl())) } };
+                new Object[] { "addedCountries",
+                        StoreCountriesChangedMessage.builder()
+                                .addedCountries(Collections.singletonList(
+                                    new com.commercetools.api.models.store_country.StoreCountryImpl())) },
+                new Object[] { "removedCountries",
+                        StoreCountriesChangedMessage.builder()
+                                .removedCountries(Collections.singletonList(
+                                    new com.commercetools.api.models.store_country.StoreCountryImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCreatedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCreatedMessagePayloadTest.java
index 65525ac0106..394cd6de0f6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCreatedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCreatedMessagePayloadTest.java
@@ -3,46 +3,44 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreCreatedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreCreatedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreCreatedMessagePayloadBuilder builder) {
         StoreCreatedMessagePayload storeCreatedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(storeCreatedMessagePayload).isInstanceOf(StoreCreatedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreCreatedMessagePayload.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { StoreCreatedMessagePayload.builder().languages(Collections.singletonList("languages")) },
-                new Object[] { StoreCreatedMessagePayload.builder()
-                        .countries(Collections
-                                .singletonList(new com.commercetools.api.models.store_country.StoreCountryImpl())) },
-                new Object[] { StoreCreatedMessagePayload.builder()
-                        .distributionChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
-                new Object[] { StoreCreatedMessagePayload.builder()
-                        .supplyChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
-                new Object[] { StoreCreatedMessagePayload.builder()
-                        .productSelections(Collections
-                                .singletonList(new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
-                new Object[] { StoreCreatedMessagePayload.builder()
+                new Object[] { "name",
+                        StoreCreatedMessagePayload.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "languages",
+                        StoreCreatedMessagePayload.builder().languages(Collections.singletonList("languages")) },
+                new Object[] { "countries",
+                        StoreCreatedMessagePayload.builder()
+                                .countries(Collections.singletonList(
+                                    new com.commercetools.api.models.store_country.StoreCountryImpl())) },
+                new Object[] { "distributionChannels",
+                        StoreCreatedMessagePayload.builder()
+                                .distributionChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
+                new Object[] { "supplyChannels",
+                        StoreCreatedMessagePayload.builder()
+                                .supplyChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
+                new Object[] { "productSelections",
+                        StoreCreatedMessagePayload.builder()
+                                .productSelections(Collections.singletonList(
+                                    new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
+                new Object[] { "custom", StoreCreatedMessagePayload.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCreatedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCreatedMessageTest.java
index 9ded8442c44..edb5c2bc2ab 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCreatedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreCreatedMessageTest.java
@@ -3,46 +3,44 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreCreatedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreCreatedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreCreatedMessageBuilder builder) {
         StoreCreatedMessage storeCreatedMessage = builder.buildUnchecked();
         Assertions.assertThat(storeCreatedMessage).isInstanceOf(StoreCreatedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreCreatedMessage.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { StoreCreatedMessage.builder().languages(Collections.singletonList("languages")) },
-                new Object[] { StoreCreatedMessage.builder()
-                        .countries(Collections
-                                .singletonList(new com.commercetools.api.models.store_country.StoreCountryImpl())) },
-                new Object[] { StoreCreatedMessage.builder()
-                        .distributionChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
-                new Object[] { StoreCreatedMessage.builder()
-                        .supplyChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
-                new Object[] { StoreCreatedMessage.builder()
-                        .productSelections(Collections
-                                .singletonList(new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
-                new Object[] { StoreCreatedMessage.builder()
+                new Object[] { "name",
+                        StoreCreatedMessage.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "languages",
+                        StoreCreatedMessage.builder().languages(Collections.singletonList("languages")) },
+                new Object[] { "countries",
+                        StoreCreatedMessage.builder()
+                                .countries(Collections.singletonList(
+                                    new com.commercetools.api.models.store_country.StoreCountryImpl())) },
+                new Object[] { "distributionChannels",
+                        StoreCreatedMessage.builder()
+                                .distributionChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
+                new Object[] { "supplyChannels",
+                        StoreCreatedMessage.builder()
+                                .supplyChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
+                new Object[] { "productSelections",
+                        StoreCreatedMessage.builder()
+                                .productSelections(Collections.singletonList(
+                                    new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
+                new Object[] { "custom", StoreCreatedMessage.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDeletedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDeletedMessagePayloadTest.java
index 5c65b3fe96c..96679316033 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDeletedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDeletedMessagePayloadTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreDeletedMessagePayloadTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDeletedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDeletedMessageTest.java
index c28ef52f50b..1d53695522b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDeletedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDeletedMessageTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreDeletedMessageTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDistributionChannelsChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDistributionChannelsChangedMessagePayloadTest.java
index 0a7a3d5c45a..74cfa329c21 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDistributionChannelsChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDistributionChannelsChangedMessagePayloadTest.java
@@ -3,38 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreDistributionChannelsChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreDistributionChannelsChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreDistributionChannelsChangedMessagePayloadBuilder builder) {
         StoreDistributionChannelsChangedMessagePayload storeDistributionChannelsChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(storeDistributionChannelsChangedMessagePayload)
                 .isInstanceOf(StoreDistributionChannelsChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreDistributionChannelsChangedMessagePayload.builder()
-                        .addedDistributionChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
-                new Object[] { StoreDistributionChannelsChangedMessagePayload.builder()
-                        .removedDistributionChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) } };
+                new Object[] { "addedDistributionChannels",
+                        StoreDistributionChannelsChangedMessagePayload.builder()
+                                .addedDistributionChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
+                new Object[] { "removedDistributionChannels",
+                        StoreDistributionChannelsChangedMessagePayload.builder()
+                                .removedDistributionChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDistributionChannelsChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDistributionChannelsChangedMessageTest.java
index 6301339bf6c..96a98342ed8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDistributionChannelsChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreDistributionChannelsChangedMessageTest.java
@@ -3,37 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreDistributionChannelsChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreDistributionChannelsChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreDistributionChannelsChangedMessageBuilder builder) {
         StoreDistributionChannelsChangedMessage storeDistributionChannelsChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(storeDistributionChannelsChangedMessage)
                 .isInstanceOf(StoreDistributionChannelsChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreDistributionChannelsChangedMessage.builder()
-                        .addedDistributionChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
-                new Object[] { StoreDistributionChannelsChangedMessage.builder()
-                        .removedDistributionChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) } };
+                new Object[] { "addedDistributionChannels",
+                        StoreDistributionChannelsChangedMessage.builder()
+                                .addedDistributionChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
+                new Object[] { "removedDistributionChannels",
+                        StoreDistributionChannelsChangedMessage.builder()
+                                .removedDistributionChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreLanguagesChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreLanguagesChangedMessagePayloadTest.java
index 0b3bdcb99fe..d5ef2b0c77a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreLanguagesChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreLanguagesChangedMessagePayloadTest.java
@@ -3,34 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreLanguagesChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreLanguagesChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreLanguagesChangedMessagePayloadBuilder builder) {
         StoreLanguagesChangedMessagePayload storeLanguagesChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(storeLanguagesChangedMessagePayload)
                 .isInstanceOf(StoreLanguagesChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreLanguagesChangedMessagePayload.builder()
-                        .addedLanguages(Collections.singletonList("addedLanguages")) },
-                new Object[] { StoreLanguagesChangedMessagePayload.builder()
+                new Object[] { "addedLanguages",
+                        StoreLanguagesChangedMessagePayload.builder()
+                                .addedLanguages(Collections.singletonList("addedLanguages")) },
+                new Object[] { "removedLanguages", StoreLanguagesChangedMessagePayload.builder()
                         .removedLanguages(Collections.singletonList("removedLanguages")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreLanguagesChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreLanguagesChangedMessageTest.java
index 2fbf06a9f4d..4b6634a2c86 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreLanguagesChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreLanguagesChangedMessageTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreLanguagesChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreLanguagesChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreLanguagesChangedMessageBuilder builder) {
         StoreLanguagesChangedMessage storeLanguagesChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(storeLanguagesChangedMessage).isInstanceOf(StoreLanguagesChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreLanguagesChangedMessage.builder()
-                        .addedLanguages(Collections.singletonList("addedLanguages")) },
-                new Object[] { StoreLanguagesChangedMessage.builder()
+                new Object[] { "addedLanguages",
+                        StoreLanguagesChangedMessage.builder()
+                                .addedLanguages(Collections.singletonList("addedLanguages")) },
+                new Object[] { "removedLanguages", StoreLanguagesChangedMessage.builder()
                         .removedLanguages(Collections.singletonList("removedLanguages")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreNameSetMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreNameSetMessagePayloadTest.java
index e2239f96085..866d7b80ea6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreNameSetMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreNameSetMessagePayloadTest.java
@@ -3,35 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreNameSetMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreNameSetMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreNameSetMessagePayloadBuilder builder) {
         StoreNameSetMessagePayload storeNameSetMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(storeNameSetMessagePayload).isInstanceOf(StoreNameSetMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreNameSetMessagePayload.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { StoreNameSetMessagePayload.builder()
-                        .nameAllLocales(Collections
-                                .singletonList(new com.commercetools.api.models.common.LocalizedStringImpl())) } };
+                new Object[] { "name",
+                        StoreNameSetMessagePayload.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "nameAllLocales",
+                        StoreNameSetMessagePayload.builder()
+                                .nameAllLocales(Collections.singletonList(
+                                    new com.commercetools.api.models.common.LocalizedStringImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreNameSetMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreNameSetMessageTest.java
index 3b0ca3bda0f..389974a92fe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreNameSetMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreNameSetMessageTest.java
@@ -3,35 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreNameSetMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreNameSetMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreNameSetMessageBuilder builder) {
         StoreNameSetMessage storeNameSetMessage = builder.buildUnchecked();
         Assertions.assertThat(storeNameSetMessage).isInstanceOf(StoreNameSetMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreNameSetMessage.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { StoreNameSetMessage.builder()
-                        .nameAllLocales(Collections
-                                .singletonList(new com.commercetools.api.models.common.LocalizedStringImpl())) } };
+                new Object[] { "name",
+                        StoreNameSetMessage.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "nameAllLocales",
+                        StoreNameSetMessage.builder()
+                                .nameAllLocales(Collections.singletonList(
+                                    new com.commercetools.api.models.common.LocalizedStringImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreProductSelectionsChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreProductSelectionsChangedMessagePayloadTest.java
index 6be586075a5..670b438f181 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreProductSelectionsChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreProductSelectionsChangedMessagePayloadTest.java
@@ -3,41 +3,36 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreProductSelectionsChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreProductSelectionsChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreProductSelectionsChangedMessagePayloadBuilder builder) {
         StoreProductSelectionsChangedMessagePayload storeProductSelectionsChangedMessagePayload = builder
                 .buildUnchecked();
         Assertions.assertThat(storeProductSelectionsChangedMessagePayload)
                 .isInstanceOf(StoreProductSelectionsChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreProductSelectionsChangedMessagePayload.builder()
-                        .addedProductSelections(Collections
-                                .singletonList(new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
-                new Object[] { StoreProductSelectionsChangedMessagePayload.builder()
-                        .removedProductSelections(Collections
-                                .singletonList(new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
-                new Object[] { StoreProductSelectionsChangedMessagePayload.builder()
-                        .updatedProductSelections(Collections.singletonList(
-                            new com.commercetools.api.models.store.ProductSelectionSettingImpl())) } };
+                new Object[] { "addedProductSelections",
+                        StoreProductSelectionsChangedMessagePayload.builder()
+                                .addedProductSelections(Collections.singletonList(
+                                    new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
+                new Object[] { "removedProductSelections",
+                        StoreProductSelectionsChangedMessagePayload.builder()
+                                .removedProductSelections(Collections.singletonList(
+                                    new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
+                new Object[] { "updatedProductSelections",
+                        StoreProductSelectionsChangedMessagePayload.builder()
+                                .updatedProductSelections(Collections.singletonList(
+                                    new com.commercetools.api.models.store.ProductSelectionSettingImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreProductSelectionsChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreProductSelectionsChangedMessageTest.java
index d89f4e8cc9c..f2b8349a018 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreProductSelectionsChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreProductSelectionsChangedMessageTest.java
@@ -3,40 +3,35 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreProductSelectionsChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreProductSelectionsChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreProductSelectionsChangedMessageBuilder builder) {
         StoreProductSelectionsChangedMessage storeProductSelectionsChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(storeProductSelectionsChangedMessage)
                 .isInstanceOf(StoreProductSelectionsChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreProductSelectionsChangedMessage.builder()
-                        .addedProductSelections(Collections
-                                .singletonList(new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
-                new Object[] { StoreProductSelectionsChangedMessage.builder()
-                        .removedProductSelections(Collections
-                                .singletonList(new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
-                new Object[] { StoreProductSelectionsChangedMessage.builder()
-                        .updatedProductSelections(Collections.singletonList(
-                            new com.commercetools.api.models.store.ProductSelectionSettingImpl())) } };
+                new Object[] { "addedProductSelections",
+                        StoreProductSelectionsChangedMessage.builder()
+                                .addedProductSelections(Collections.singletonList(
+                                    new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
+                new Object[] { "removedProductSelections",
+                        StoreProductSelectionsChangedMessage.builder()
+                                .removedProductSelections(Collections.singletonList(
+                                    new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
+                new Object[] { "updatedProductSelections",
+                        StoreProductSelectionsChangedMessage.builder()
+                                .updatedProductSelections(Collections.singletonList(
+                                    new com.commercetools.api.models.store.ProductSelectionSettingImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreSupplyChannelsChangedMessagePayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreSupplyChannelsChangedMessagePayloadTest.java
index 902690f4b8d..5dbbd722338 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreSupplyChannelsChangedMessagePayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreSupplyChannelsChangedMessagePayloadTest.java
@@ -3,37 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreSupplyChannelsChangedMessagePayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreSupplyChannelsChangedMessagePayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreSupplyChannelsChangedMessagePayloadBuilder builder) {
         StoreSupplyChannelsChangedMessagePayload storeSupplyChannelsChangedMessagePayload = builder.buildUnchecked();
         Assertions.assertThat(storeSupplyChannelsChangedMessagePayload)
                 .isInstanceOf(StoreSupplyChannelsChangedMessagePayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreSupplyChannelsChangedMessagePayload.builder()
-                        .addedSupplyChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
-                new Object[] { StoreSupplyChannelsChangedMessagePayload.builder()
-                        .removedSupplyChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) } };
+                new Object[] { "addedSupplyChannels",
+                        StoreSupplyChannelsChangedMessagePayload.builder()
+                                .addedSupplyChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
+                new Object[] { "removedSupplyChannels",
+                        StoreSupplyChannelsChangedMessagePayload.builder()
+                                .removedSupplyChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreSupplyChannelsChangedMessageTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreSupplyChannelsChangedMessageTest.java
index b8029352247..db211c212df 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreSupplyChannelsChangedMessageTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/StoreSupplyChannelsChangedMessageTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreSupplyChannelsChangedMessageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreSupplyChannelsChangedMessageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreSupplyChannelsChangedMessageBuilder builder) {
         StoreSupplyChannelsChangedMessage storeSupplyChannelsChangedMessage = builder.buildUnchecked();
         Assertions.assertThat(storeSupplyChannelsChangedMessage).isInstanceOf(StoreSupplyChannelsChangedMessage.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreSupplyChannelsChangedMessage.builder()
-                        .addedSupplyChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
-                new Object[] { StoreSupplyChannelsChangedMessage.builder()
-                        .removedSupplyChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) } };
+                new Object[] { "addedSupplyChannels",
+                        StoreSupplyChannelsChangedMessage.builder()
+                                .addedSupplyChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
+                new Object[] { "removedSupplyChannels",
+                        StoreSupplyChannelsChangedMessage.builder()
+                                .removedSupplyChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/UserProvidedIdentifiersTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/UserProvidedIdentifiersTest.java
index 79cdae24a5b..2b1199c2500 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/UserProvidedIdentifiersTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/message/UserProvidedIdentifiersTest.java
@@ -1,37 +1,30 @@
 
 package com.commercetools.api.models.message;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class UserProvidedIdentifiersTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(UserProvidedIdentifiersBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, UserProvidedIdentifiersBuilder builder) {
         UserProvidedIdentifiers userProvidedIdentifiers = builder.buildUnchecked();
         Assertions.assertThat(userProvidedIdentifiers).isInstanceOf(UserProvidedIdentifiers.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { UserProvidedIdentifiers.builder().key("key") },
-                new Object[] { UserProvidedIdentifiers.builder().externalId("externalId") },
-                new Object[] { UserProvidedIdentifiers.builder().orderNumber("orderNumber") },
-                new Object[] { UserProvidedIdentifiers.builder().customerNumber("customerNumber") },
-                new Object[] { UserProvidedIdentifiers.builder().sku("sku") },
-                new Object[] { UserProvidedIdentifiers.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { UserProvidedIdentifiers.builder()
+        return new Object[][] { new Object[] { "key", UserProvidedIdentifiers.builder().key("key") },
+                new Object[] { "externalId", UserProvidedIdentifiers.builder().externalId("externalId") },
+                new Object[] { "orderNumber", UserProvidedIdentifiers.builder().orderNumber("orderNumber") },
+                new Object[] { "customerNumber", UserProvidedIdentifiers.builder().customerNumber("customerNumber") },
+                new Object[] { "sku", UserProvidedIdentifiers.builder().sku("sku") },
+                new Object[] { "slug",
+                        UserProvidedIdentifiers.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "containerAndKey", UserProvidedIdentifiers.builder()
                         .containerAndKey(new com.commercetools.api.models.message.ContainerAndKeyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/CustomLineItemImportDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/CustomLineItemImportDraftTest.java
index 771964d9073..5ca2d225555 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/CustomLineItemImportDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/CustomLineItemImportDraftTest.java
@@ -3,49 +3,46 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomLineItemImportDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomLineItemImportDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomLineItemImportDraftBuilder builder) {
         CustomLineItemImportDraft customLineItemImportDraft = builder.buildUnchecked();
         Assertions.assertThat(customLineItemImportDraft).isInstanceOf(CustomLineItemImportDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomLineItemImportDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { CustomLineItemImportDraft.builder().key("key") },
-                new Object[] { CustomLineItemImportDraft.builder().slug("slug") },
-                new Object[] { CustomLineItemImportDraft.builder().quantity(8L) },
-                new Object[] { CustomLineItemImportDraft.builder()
-                        .money(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { CustomLineItemImportDraft.builder()
-                        .taxRate(new com.commercetools.api.models.tax_category.TaxRateImpl()) },
-                new Object[] { CustomLineItemImportDraft.builder()
+                new Object[] { "name",
+                        CustomLineItemImportDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "key", CustomLineItemImportDraft.builder().key("key") },
+                new Object[] { "slug", CustomLineItemImportDraft.builder().slug("slug") },
+                new Object[] { "quantity", CustomLineItemImportDraft.builder().quantity(8L) },
+                new Object[] { "money",
+                        CustomLineItemImportDraft.builder()
+                                .money(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "taxRate",
+                        CustomLineItemImportDraft.builder()
+                                .taxRate(new com.commercetools.api.models.tax_category.TaxRateImpl()) },
+                new Object[] { "taxCategory", CustomLineItemImportDraft.builder()
                         .taxCategory(
                             new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) },
-                new Object[] { CustomLineItemImportDraft.builder()
+                new Object[] { "priceMode", CustomLineItemImportDraft.builder()
                         .priceMode(com.commercetools.api.models.cart.CustomLineItemPriceMode.findEnum("Standard")) },
-                new Object[] { CustomLineItemImportDraft.builder()
+                new Object[] { "shippingDetails", CustomLineItemImportDraft.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) },
-                new Object[] { CustomLineItemImportDraft.builder()
-                        .state(Collections.singletonList(new com.commercetools.api.models.order.ItemStateImpl())) },
-                new Object[] { CustomLineItemImportDraft.builder()
+                new Object[] { "state",
+                        CustomLineItemImportDraft.builder()
+                                .state(Collections
+                                        .singletonList(new com.commercetools.api.models.order.ItemStateImpl())) },
+                new Object[] { "custom", CustomLineItemImportDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/CustomLineItemReturnItemTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/CustomLineItemReturnItemTest.java
index 8e8a07cdace..03fb968ff2e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/CustomLineItemReturnItemTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/CustomLineItemReturnItemTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomLineItemReturnItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomLineItemReturnItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomLineItemReturnItemBuilder builder) {
         CustomLineItemReturnItem customLineItemReturnItem = builder.buildUnchecked();
         Assertions.assertThat(customLineItemReturnItem).isInstanceOf(CustomLineItemReturnItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomLineItemReturnItem.builder().key("key") },
-                new Object[] { CustomLineItemReturnItem.builder().customLineItemId("customLineItemId") },
-                new Object[] { CustomLineItemReturnItem.builder().quantity(8L) } };
+        return new Object[][] { new Object[] { "key", CustomLineItemReturnItem.builder().key("key") },
+                new Object[] { "customLineItemId",
+                        CustomLineItemReturnItem.builder().customLineItemId("customLineItemId") },
+                new Object[] { "quantity", CustomLineItemReturnItem.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DeliveryDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DeliveryDraftTest.java
index 2a6385bd262..e85ccb0e13b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DeliveryDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DeliveryDraftTest.java
@@ -3,37 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryDraftBuilder builder) {
         DeliveryDraft deliveryDraft = builder.buildUnchecked();
         Assertions.assertThat(deliveryDraft).isInstanceOf(DeliveryDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryDraft.builder().key("key") },
-                new Object[] { DeliveryDraft.builder()
+        return new Object[][] { new Object[] { "key", DeliveryDraft.builder().key("key") }, new Object[] { "items",
+                DeliveryDraft.builder()
                         .items(Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] { DeliveryDraft.builder()
-                        .parcels(Collections.singletonList(new com.commercetools.api.models.order.ParcelDraftImpl())) },
-                new Object[] {
+                new Object[] { "parcels",
+                        DeliveryDraft.builder()
+                                .parcels(Collections
+                                        .singletonList(new com.commercetools.api.models.order.ParcelDraftImpl())) },
+                new Object[] { "address",
                         DeliveryDraft.builder().address(new com.commercetools.api.models.common.AddressDraftImpl()) },
-                new Object[] { DeliveryDraft.builder()
+                new Object[] { "custom", DeliveryDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DeliveryItemTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DeliveryItemTest.java
index 157705a774a..c913b1cb5a5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DeliveryItemTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DeliveryItemTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryItemBuilder builder) {
         DeliveryItem deliveryItem = builder.buildUnchecked();
         Assertions.assertThat(deliveryItem).isInstanceOf(DeliveryItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryItem.builder().id("id") },
-                new Object[] { DeliveryItem.builder().quantity(8L) } };
+        return new Object[][] { new Object[] { "id", DeliveryItem.builder().id("id") },
+                new Object[] { "quantity", DeliveryItem.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DeliveryTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DeliveryTest.java
index e778d9d3fc6..6d05a9903f2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DeliveryTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DeliveryTest.java
@@ -4,38 +4,34 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryBuilder builder) {
         Delivery delivery = builder.buildUnchecked();
         Assertions.assertThat(delivery).isInstanceOf(Delivery.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Delivery.builder().id("id") },
-                new Object[] { Delivery.builder().key("key") },
-                new Object[] { Delivery.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Delivery.builder()
-                        .items(Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] { Delivery.builder()
+        return new Object[][] { new Object[] { "id", Delivery.builder().id("id") },
+                new Object[] { "key", Delivery.builder().key("key") },
+                new Object[] { "createdAt", Delivery.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "items",
+                        Delivery.builder()
+                                .items(Collections
+                                        .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
+                new Object[] { "parcels", Delivery.builder()
                         .parcels(Collections.singletonList(new com.commercetools.api.models.order.ParcelImpl())) },
-                new Object[] { Delivery.builder().address(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { Delivery.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
+                new Object[] { "address",
+                        Delivery.builder().address(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "custom",
+                        Delivery.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DiscountedLineItemPriceDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DiscountedLineItemPriceDraftTest.java
index dfe00912d6f..a0dd8cdd54d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DiscountedLineItemPriceDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/DiscountedLineItemPriceDraftTest.java
@@ -3,35 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedLineItemPriceDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedLineItemPriceDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedLineItemPriceDraftBuilder builder) {
         DiscountedLineItemPriceDraft discountedLineItemPriceDraft = builder.buildUnchecked();
         Assertions.assertThat(discountedLineItemPriceDraft).isInstanceOf(DiscountedLineItemPriceDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountedLineItemPriceDraft.builder()
-                        .value(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { DiscountedLineItemPriceDraft.builder()
-                        .includedDiscounts(Collections.singletonList(
-                            new com.commercetools.api.models.cart.DiscountedLineItemPortionDraftImpl())) } };
+                new Object[] { "value",
+                        DiscountedLineItemPriceDraft.builder()
+                                .value(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "includedDiscounts",
+                        DiscountedLineItemPriceDraft.builder()
+                                .includedDiscounts(Collections.singletonList(
+                                    new com.commercetools.api.models.cart.DiscountedLineItemPortionDraftImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/HitTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/HitTest.java
index 1740c2909d3..5422099cfe4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/HitTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/HitTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class HitTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(HitBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, HitBuilder builder) {
         Hit hit = builder.buildUnchecked();
         Assertions.assertThat(hit).isInstanceOf(Hit.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Hit.builder().id("id") }, new Object[] { Hit.builder().version(2L) },
-                new Object[] { Hit.builder().relevance(0.5586561) } };
+        return new Object[][] { new Object[] { "id", Hit.builder().id("id") },
+                new Object[] { "version", Hit.builder().version(2L) },
+                new Object[] { "relevance", Hit.builder().relevance(0.5586561) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ItemStateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ItemStateTest.java
index 5255639347a..9749673652e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ItemStateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ItemStateTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ItemStateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ItemStateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ItemStateBuilder builder) {
         ItemState itemState = builder.buildUnchecked();
         Assertions.assertThat(itemState).isInstanceOf(ItemState.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ItemState.builder().quantity(8L) }, new Object[] {
+        return new Object[][] { new Object[] { "quantity", ItemState.builder().quantity(8L) }, new Object[] { "state",
                 ItemState.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/LineItemImportDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/LineItemImportDraftTest.java
index e2c5765ac6c..fbeb84bdae4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/LineItemImportDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/LineItemImportDraftTest.java
@@ -3,53 +3,52 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LineItemImportDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LineItemImportDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LineItemImportDraftBuilder builder) {
         LineItemImportDraft lineItemImportDraft = builder.buildUnchecked();
         Assertions.assertThat(lineItemImportDraft).isInstanceOf(LineItemImportDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { LineItemImportDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { LineItemImportDraft.builder().key("key") },
-                new Object[] { LineItemImportDraft.builder()
-                        .variant(new com.commercetools.api.models.order.ProductVariantImportDraftImpl()) },
-                new Object[] { LineItemImportDraft.builder().productId("productId") },
-                new Object[] { LineItemImportDraft.builder().quantity(8L) },
-                new Object[] {
+                new Object[] { "name",
+                        LineItemImportDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "key", LineItemImportDraft.builder().key("key") },
+                new Object[] { "variant",
+                        LineItemImportDraft.builder()
+                                .variant(new com.commercetools.api.models.order.ProductVariantImportDraftImpl()) },
+                new Object[] { "productId", LineItemImportDraft.builder().productId("productId") },
+                new Object[] { "quantity", LineItemImportDraft.builder().quantity(8L) },
+                new Object[] { "price",
                         LineItemImportDraft.builder().price(new com.commercetools.api.models.common.PriceDraftImpl()) },
-                new Object[] { LineItemImportDraft.builder()
-                        .taxRate(new com.commercetools.api.models.tax_category.TaxRateImpl()) },
-                new Object[] { LineItemImportDraft.builder()
-                        .distributionChannel(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { LineItemImportDraft.builder()
+                new Object[] { "taxRate",
+                        LineItemImportDraft.builder()
+                                .taxRate(new com.commercetools.api.models.tax_category.TaxRateImpl()) },
+                new Object[] { "distributionChannel",
+                        LineItemImportDraft.builder()
+                                .distributionChannel(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "supplyChannel", LineItemImportDraft.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { LineItemImportDraft.builder()
-                        .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
-                new Object[] { LineItemImportDraft.builder()
+                new Object[] { "inventoryMode",
+                        LineItemImportDraft.builder()
+                                .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
+                new Object[] { "shippingDetails", LineItemImportDraft.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) },
-                new Object[] { LineItemImportDraft.builder()
-                        .state(Collections.singletonList(new com.commercetools.api.models.order.ItemStateImpl())) },
-                new Object[] { LineItemImportDraft.builder()
+                new Object[] { "state",
+                        LineItemImportDraft.builder()
+                                .state(Collections
+                                        .singletonList(new com.commercetools.api.models.order.ItemStateImpl())) },
+                new Object[] { "custom", LineItemImportDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/LineItemReturnItemTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/LineItemReturnItemTest.java
index 4bf6f445730..9b4fdc83255 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/LineItemReturnItemTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/LineItemReturnItemTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LineItemReturnItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LineItemReturnItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LineItemReturnItemBuilder builder) {
         LineItemReturnItem lineItemReturnItem = builder.buildUnchecked();
         Assertions.assertThat(lineItemReturnItem).isInstanceOf(LineItemReturnItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LineItemReturnItem.builder().key("key") },
-                new Object[] { LineItemReturnItem.builder().lineItemId("lineItemId") },
-                new Object[] { LineItemReturnItem.builder().quantity(8L) } };
+        return new Object[][] { new Object[] { "key", LineItemReturnItem.builder().key("key") },
+                new Object[] { "lineItemId", LineItemReturnItem.builder().lineItemId("lineItemId") },
+                new Object[] { "quantity", LineItemReturnItem.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddDeliveryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddDeliveryActionTest.java
index df0b0b4f004..ded4f6365e4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddDeliveryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddDeliveryActionTest.java
@@ -3,38 +3,36 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderAddDeliveryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderAddDeliveryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderAddDeliveryActionBuilder builder) {
         OrderAddDeliveryAction orderAddDeliveryAction = builder.buildUnchecked();
         Assertions.assertThat(orderAddDeliveryAction).isInstanceOf(OrderAddDeliveryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderAddDeliveryAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { OrderAddDeliveryAction.builder().shippingKey("shippingKey") },
-                new Object[] { OrderAddDeliveryAction.builder()
-                        .items(Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] { OrderAddDeliveryAction.builder()
-                        .address(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { OrderAddDeliveryAction.builder()
-                        .parcels(Collections.singletonList(new com.commercetools.api.models.order.ParcelDraftImpl())) },
-                new Object[] { OrderAddDeliveryAction.builder()
+        return new Object[][] {
+                new Object[] { "deliveryKey", OrderAddDeliveryAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "shippingKey", OrderAddDeliveryAction.builder().shippingKey("shippingKey") },
+                new Object[] { "items",
+                        OrderAddDeliveryAction.builder()
+                                .items(Collections
+                                        .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
+                new Object[] { "address",
+                        OrderAddDeliveryAction.builder()
+                                .address(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "parcels",
+                        OrderAddDeliveryAction.builder()
+                                .parcels(Collections
+                                        .singletonList(new com.commercetools.api.models.order.ParcelDraftImpl())) },
+                new Object[] { "custom", OrderAddDeliveryAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddItemShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddItemShippingAddressActionTest.java
index e203a702e8f..c719f59624e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddItemShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddItemShippingAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderAddItemShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderAddItemShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderAddItemShippingAddressActionBuilder builder) {
         OrderAddItemShippingAddressAction orderAddItemShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(orderAddItemShippingAddressAction).isInstanceOf(OrderAddItemShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderAddItemShippingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", OrderAddItemShippingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddParcelToDeliveryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddParcelToDeliveryActionTest.java
index 0ada8e0d0c7..21bf4fefd12 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddParcelToDeliveryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddParcelToDeliveryActionTest.java
@@ -3,39 +3,36 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderAddParcelToDeliveryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderAddParcelToDeliveryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderAddParcelToDeliveryActionBuilder builder) {
         OrderAddParcelToDeliveryAction orderAddParcelToDeliveryAction = builder.buildUnchecked();
         Assertions.assertThat(orderAddParcelToDeliveryAction).isInstanceOf(OrderAddParcelToDeliveryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderAddParcelToDeliveryAction.builder().deliveryId("deliveryId") },
-                new Object[] { OrderAddParcelToDeliveryAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { OrderAddParcelToDeliveryAction.builder().parcelKey("parcelKey") },
-                new Object[] { OrderAddParcelToDeliveryAction.builder()
-                        .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) },
-                new Object[] { OrderAddParcelToDeliveryAction.builder()
-                        .trackingData(new com.commercetools.api.models.order.TrackingDataImpl()) },
-                new Object[] { OrderAddParcelToDeliveryAction.builder()
-                        .items(Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] { OrderAddParcelToDeliveryAction.builder()
+        return new Object[][] {
+                new Object[] { "deliveryId", OrderAddParcelToDeliveryAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey", OrderAddParcelToDeliveryAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "parcelKey", OrderAddParcelToDeliveryAction.builder().parcelKey("parcelKey") },
+                new Object[] { "measurements",
+                        OrderAddParcelToDeliveryAction.builder()
+                                .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) },
+                new Object[] { "trackingData",
+                        OrderAddParcelToDeliveryAction.builder()
+                                .trackingData(new com.commercetools.api.models.order.TrackingDataImpl()) },
+                new Object[] { "items",
+                        OrderAddParcelToDeliveryAction.builder()
+                                .items(Collections
+                                        .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
+                new Object[] { "custom", OrderAddParcelToDeliveryAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddPaymentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddPaymentActionTest.java
index 9b5169c7570..5f289e0ecc1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddPaymentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddPaymentActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderAddPaymentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderAddPaymentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderAddPaymentActionBuilder builder) {
         OrderAddPaymentAction orderAddPaymentAction = builder.buildUnchecked();
         Assertions.assertThat(orderAddPaymentAction).isInstanceOf(OrderAddPaymentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderAddPaymentAction.builder()
+        return new Object[][] { new Object[] { "payment", OrderAddPaymentAction.builder()
                 .payment(new com.commercetools.api.models.payment.PaymentResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddReturnInfoActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddReturnInfoActionTest.java
index 9fe3a2f1758..e98c3bf06d0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddReturnInfoActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderAddReturnInfoActionTest.java
@@ -4,36 +4,29 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderAddReturnInfoActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderAddReturnInfoActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderAddReturnInfoActionBuilder builder) {
         OrderAddReturnInfoAction orderAddReturnInfoAction = builder.buildUnchecked();
         Assertions.assertThat(orderAddReturnInfoAction).isInstanceOf(OrderAddReturnInfoAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderAddReturnInfoAction.builder().returnTrackingId("returnTrackingId") },
-                new Object[] {
+                new Object[] { "returnTrackingId",
+                        OrderAddReturnInfoAction.builder().returnTrackingId("returnTrackingId") },
+                new Object[] { "items",
                         OrderAddReturnInfoAction.builder()
                                 .items(Collections
                                         .singletonList(new com.commercetools.api.models.order.ReturnItemDraftImpl())) },
-                new Object[] {
+                new Object[] { "returnDate",
                         OrderAddReturnInfoAction.builder().returnDate(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderChangeOrderStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderChangeOrderStateActionTest.java
index 17e9ee2efa2..d20953bc6ac 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderChangeOrderStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderChangeOrderStateActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderChangeOrderStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderChangeOrderStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderChangeOrderStateActionBuilder builder) {
         OrderChangeOrderStateAction orderChangeOrderStateAction = builder.buildUnchecked();
         Assertions.assertThat(orderChangeOrderStateAction).isInstanceOf(OrderChangeOrderStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderChangeOrderStateAction.builder()
+        return new Object[][] { new Object[] { "orderState", OrderChangeOrderStateAction.builder()
                 .orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderChangePaymentStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderChangePaymentStateActionTest.java
index b5a58c9bd91..6ba0789fe24 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderChangePaymentStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderChangePaymentStateActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderChangePaymentStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderChangePaymentStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderChangePaymentStateActionBuilder builder) {
         OrderChangePaymentStateAction orderChangePaymentStateAction = builder.buildUnchecked();
         Assertions.assertThat(orderChangePaymentStateAction).isInstanceOf(OrderChangePaymentStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderChangePaymentStateAction.builder()
+        return new Object[][] { new Object[] { "paymentState", OrderChangePaymentStateAction.builder()
                 .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderChangeShipmentStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderChangeShipmentStateActionTest.java
index 1a34430810e..48b70dad9e0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderChangeShipmentStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderChangeShipmentStateActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderChangeShipmentStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderChangeShipmentStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderChangeShipmentStateActionBuilder builder) {
         OrderChangeShipmentStateAction orderChangeShipmentStateAction = builder.buildUnchecked();
         Assertions.assertThat(orderChangeShipmentStateAction).isInstanceOf(OrderChangeShipmentStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderChangeShipmentStateAction.builder()
+        return new Object[][] { new Object[] { "shipmentState", OrderChangeShipmentStateAction.builder()
                 .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderFromCartDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderFromCartDraftTest.java
index 5e6fea4346c..8c979fc0933 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderFromCartDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderFromCartDraftTest.java
@@ -1,44 +1,42 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderFromCartDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderFromCartDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderFromCartDraftBuilder builder) {
         OrderFromCartDraft orderFromCartDraft = builder.buildUnchecked();
         Assertions.assertThat(orderFromCartDraft).isInstanceOf(OrderFromCartDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderFromCartDraft.builder().id("id") },
-                new Object[] { OrderFromCartDraft.builder()
-                        .cart(new com.commercetools.api.models.cart.CartResourceIdentifierImpl()) },
-                new Object[] { OrderFromCartDraft.builder().version(2L) },
-                new Object[] { OrderFromCartDraft.builder().orderNumber("orderNumber") },
-                new Object[] { OrderFromCartDraft.builder().purchaseOrderNumber("purchaseOrderNumber") },
-                new Object[] { OrderFromCartDraft.builder()
-                        .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) },
-                new Object[] { OrderFromCartDraft.builder()
-                        .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) },
-                new Object[] { OrderFromCartDraft.builder()
-                        .orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) },
-                new Object[] { OrderFromCartDraft.builder()
-                        .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { OrderFromCartDraft.builder()
+        return new Object[][] { new Object[] { "id", OrderFromCartDraft.builder().id("id") },
+                new Object[] { "cart",
+                        OrderFromCartDraft.builder()
+                                .cart(new com.commercetools.api.models.cart.CartResourceIdentifierImpl()) },
+                new Object[] { "version", OrderFromCartDraft.builder().version(2L) },
+                new Object[] { "orderNumber", OrderFromCartDraft.builder().orderNumber("orderNumber") },
+                new Object[] { "purchaseOrderNumber",
+                        OrderFromCartDraft.builder().purchaseOrderNumber("purchaseOrderNumber") },
+                new Object[] { "paymentState",
+                        OrderFromCartDraft.builder()
+                                .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) },
+                new Object[] { "shipmentState",
+                        OrderFromCartDraft.builder()
+                                .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) },
+                new Object[] { "orderState",
+                        OrderFromCartDraft.builder()
+                                .orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) },
+                new Object[] { "state",
+                        OrderFromCartDraft.builder()
+                                .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "custom", OrderFromCartDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderFromQuoteDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderFromQuoteDraftTest.java
index 38f13702a81..f659e837c67 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderFromQuoteDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderFromQuoteDraftTest.java
@@ -1,42 +1,38 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderFromQuoteDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderFromQuoteDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderFromQuoteDraftBuilder builder) {
         OrderFromQuoteDraft orderFromQuoteDraft = builder.buildUnchecked();
         Assertions.assertThat(orderFromQuoteDraft).isInstanceOf(OrderFromQuoteDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderFromQuoteDraft.builder()
-                        .quote(new com.commercetools.api.models.quote.QuoteResourceIdentifierImpl()) },
-                new Object[] { OrderFromQuoteDraft.builder().version(2L) },
-                new Object[] { OrderFromQuoteDraft.builder().quoteStateToAccepted(true) },
-                new Object[] { OrderFromQuoteDraft.builder().orderNumber("orderNumber") },
-                new Object[] { OrderFromQuoteDraft.builder()
-                        .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) },
-                new Object[] { OrderFromQuoteDraft.builder()
-                        .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) },
-                new Object[] { OrderFromQuoteDraft.builder()
-                        .orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) },
-                new Object[] { OrderFromQuoteDraft.builder()
+                new Object[] { "quote",
+                        OrderFromQuoteDraft.builder()
+                                .quote(new com.commercetools.api.models.quote.QuoteResourceIdentifierImpl()) },
+                new Object[] { "version", OrderFromQuoteDraft.builder().version(2L) },
+                new Object[] { "quoteStateToAccepted", OrderFromQuoteDraft.builder().quoteStateToAccepted(true) },
+                new Object[] { "orderNumber", OrderFromQuoteDraft.builder().orderNumber("orderNumber") },
+                new Object[] { "paymentState",
+                        OrderFromQuoteDraft.builder()
+                                .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) },
+                new Object[] { "shipmentState",
+                        OrderFromQuoteDraft.builder()
+                                .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) },
+                new Object[] { "orderState",
+                        OrderFromQuoteDraft.builder()
+                                .orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) },
+                new Object[] { "state", OrderFromQuoteDraft.builder()
                         .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderImportCustomLineItemStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderImportCustomLineItemStateActionTest.java
index 6a78d5634ab..9b2195601e3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderImportCustomLineItemStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderImportCustomLineItemStateActionTest.java
@@ -3,34 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderImportCustomLineItemStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderImportCustomLineItemStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderImportCustomLineItemStateActionBuilder builder) {
         OrderImportCustomLineItemStateAction orderImportCustomLineItemStateAction = builder.buildUnchecked();
         Assertions.assertThat(orderImportCustomLineItemStateAction)
                 .isInstanceOf(OrderImportCustomLineItemStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderImportCustomLineItemStateAction.builder().customLineItemId("customLineItemId") },
-                new Object[] { OrderImportCustomLineItemStateAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { OrderImportCustomLineItemStateAction.builder()
+                new Object[] { "customLineItemId",
+                        OrderImportCustomLineItemStateAction.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
+                        OrderImportCustomLineItemStateAction.builder().customLineItemKey("customLineItemKey") },
+                new Object[] { "state", OrderImportCustomLineItemStateAction.builder()
                         .state(Collections.singletonList(new com.commercetools.api.models.order.ItemStateImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderImportDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderImportDraftTest.java
index 61c9141950e..3e347d9c73b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderImportDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderImportDraftTest.java
@@ -4,83 +4,92 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderImportDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderImportDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderImportDraftBuilder builder) {
         OrderImportDraft orderImportDraft = builder.buildUnchecked();
         Assertions.assertThat(orderImportDraft).isInstanceOf(OrderImportDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderImportDraft.builder().orderNumber("orderNumber") },
-                new Object[] { OrderImportDraft.builder().purchaseOrderNumber("purchaseOrderNumber") },
-                new Object[] { OrderImportDraft.builder().customerId("customerId") },
-                new Object[] { OrderImportDraft.builder().customerEmail("customerEmail") },
-                new Object[] { OrderImportDraft.builder()
+        return new Object[][] { new Object[] { "orderNumber", OrderImportDraft.builder().orderNumber("orderNumber") },
+                new Object[] { "purchaseOrderNumber",
+                        OrderImportDraft.builder().purchaseOrderNumber("purchaseOrderNumber") },
+                new Object[] { "customerId", OrderImportDraft.builder().customerId("customerId") },
+                new Object[] { "customerEmail", OrderImportDraft.builder().customerEmail("customerEmail") },
+                new Object[] { "customerGroup", OrderImportDraft.builder()
                         .customerGroup(
                             new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) },
-                new Object[] { OrderImportDraft.builder()
+                new Object[] { "businessUnit", OrderImportDraft.builder()
                         .businessUnit(
                             new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) },
-                new Object[] { OrderImportDraft.builder()
-                        .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) },
-                new Object[] { OrderImportDraft.builder()
-                        .lineItems(Collections
-                                .singletonList(new com.commercetools.api.models.order.LineItemImportDraftImpl())) },
-                new Object[] { OrderImportDraft.builder()
-                        .customLineItems(Collections.singletonList(
-                            new com.commercetools.api.models.order.CustomLineItemImportDraftImpl())) },
-                new Object[] {
+                new Object[] { "store",
+                        OrderImportDraft.builder()
+                                .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) },
+                new Object[] { "lineItems",
+                        OrderImportDraft.builder()
+                                .lineItems(Collections.singletonList(
+                                    new com.commercetools.api.models.order.LineItemImportDraftImpl())) },
+                new Object[] { "customLineItems",
+                        OrderImportDraft.builder()
+                                .customLineItems(Collections.singletonList(
+                                    new com.commercetools.api.models.order.CustomLineItemImportDraftImpl())) },
+                new Object[] { "totalPrice",
                         OrderImportDraft.builder().totalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { OrderImportDraft.builder()
-                        .taxedPrice(new com.commercetools.api.models.cart.TaxedPriceDraftImpl()) },
-                new Object[] { OrderImportDraft.builder()
-                        .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) },
-                new Object[] { OrderImportDraft.builder()
-                        .taxCalculationMode(
-                            com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) },
-                new Object[] { OrderImportDraft.builder()
-                        .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
-                new Object[] { OrderImportDraft.builder()
-                        .billingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { OrderImportDraft.builder()
-                        .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] {
+                new Object[] { "taxedPrice",
+                        OrderImportDraft.builder()
+                                .taxedPrice(new com.commercetools.api.models.cart.TaxedPriceDraftImpl()) },
+                new Object[] { "taxRoundingMode",
+                        OrderImportDraft.builder()
+                                .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) },
+                new Object[] { "taxCalculationMode",
+                        OrderImportDraft.builder()
+                                .taxCalculationMode(
+                                    com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) },
+                new Object[] { "inventoryMode",
+                        OrderImportDraft.builder()
+                                .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
+                new Object[] { "billingAddress",
+                        OrderImportDraft.builder()
+                                .billingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "shippingAddress",
+                        OrderImportDraft.builder()
+                                .shippingAddress(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "itemShippingAddresses",
                         OrderImportDraft.builder()
                                 .itemShippingAddresses(Collections
                                         .singletonList(new com.commercetools.api.models.common.BaseAddressImpl())) },
-                new Object[] { OrderImportDraft.builder()
-                        .shippingInfo(new com.commercetools.api.models.order.ShippingInfoImportDraftImpl()) },
-                new Object[] { OrderImportDraft.builder()
-                        .paymentInfo(new com.commercetools.api.models.order.PaymentInfoImpl()) },
-                new Object[] { OrderImportDraft.builder()
-                        .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) },
-                new Object[] { OrderImportDraft.builder()
-                        .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) },
-                new Object[] { OrderImportDraft.builder()
-                        .orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) },
-                new Object[] {
+                new Object[] { "shippingInfo",
+                        OrderImportDraft.builder()
+                                .shippingInfo(new com.commercetools.api.models.order.ShippingInfoImportDraftImpl()) },
+                new Object[] { "paymentInfo",
+                        OrderImportDraft.builder()
+                                .paymentInfo(new com.commercetools.api.models.order.PaymentInfoImpl()) },
+                new Object[] { "paymentState",
+                        OrderImportDraft.builder()
+                                .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) },
+                new Object[] { "shipmentState",
+                        OrderImportDraft.builder()
+                                .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) },
+                new Object[] { "orderState",
+                        OrderImportDraft.builder()
+                                .orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) },
+                new Object[] { "state",
                         OrderImportDraft.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { OrderImportDraft.builder().country("country") },
-                new Object[] { OrderImportDraft.builder()
-                        .origin(com.commercetools.api.models.cart.CartOrigin.findEnum("Customer")) },
-                new Object[] { OrderImportDraft.builder().completedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { OrderImportDraft.builder()
+                new Object[] { "country", OrderImportDraft.builder().country("country") },
+                new Object[] { "origin",
+                        OrderImportDraft.builder()
+                                .origin(com.commercetools.api.models.cart.CartOrigin.findEnum("Customer")) },
+                new Object[] { "completedAt",
+                        OrderImportDraft.builder().completedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "custom", OrderImportDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderImportLineItemStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderImportLineItemStateActionTest.java
index c9f3ad357c4..0bc767adc39 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderImportLineItemStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderImportLineItemStateActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderImportLineItemStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderImportLineItemStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderImportLineItemStateActionBuilder builder) {
         OrderImportLineItemStateAction orderImportLineItemStateAction = builder.buildUnchecked();
         Assertions.assertThat(orderImportLineItemStateAction).isInstanceOf(OrderImportLineItemStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderImportLineItemStateAction.builder().lineItemId("lineItemId") },
-                new Object[] { OrderImportLineItemStateAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { OrderImportLineItemStateAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", OrderImportLineItemStateAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", OrderImportLineItemStateAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "state", OrderImportLineItemStateAction.builder()
                         .state(Collections.singletonList(new com.commercetools.api.models.order.ItemStateImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderPagedQueryResponseTest.java
index ced0a4b2cf6..37250b0b5cd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderPagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderPagedQueryResponseBuilder builder) {
         OrderPagedQueryResponse orderPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(orderPagedQueryResponse).isInstanceOf(OrderPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderPagedQueryResponse.builder().limit(7L) },
-                new Object[] { OrderPagedQueryResponse.builder().offset(3L) },
-                new Object[] { OrderPagedQueryResponse.builder().count(2L) },
-                new Object[] { OrderPagedQueryResponse.builder().total(1L) },
-                new Object[] { OrderPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", OrderPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", OrderPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", OrderPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", OrderPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", OrderPagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.order.OrderImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderPagedSearchResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderPagedSearchResponseTest.java
index 11c77c21d9a..df97950fd86 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderPagedSearchResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderPagedSearchResponseTest.java
@@ -3,33 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderPagedSearchResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderPagedSearchResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderPagedSearchResponseBuilder builder) {
         OrderPagedSearchResponse orderPagedSearchResponse = builder.buildUnchecked();
         Assertions.assertThat(orderPagedSearchResponse).isInstanceOf(OrderPagedSearchResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderPagedSearchResponse.builder().total(1L) },
-                new Object[] { OrderPagedSearchResponse.builder().offset(3L) },
-                new Object[] { OrderPagedSearchResponse.builder().limit(7L) },
-                new Object[] { OrderPagedSearchResponse.builder()
+        return new Object[][] { new Object[] { "total", OrderPagedSearchResponse.builder().total(1L) },
+                new Object[] { "offset", OrderPagedSearchResponse.builder().offset(3L) },
+                new Object[] { "limit", OrderPagedSearchResponse.builder().limit(7L) },
+                new Object[] { "hits", OrderPagedSearchResponse.builder()
                         .hits(Collections.singletonList(new com.commercetools.api.models.order.HitImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderReferenceTest.java
index 43946afb544..7b076894577 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderReferenceTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderReferenceBuilder builder) {
         OrderReference orderReference = builder.buildUnchecked();
         Assertions.assertThat(orderReference).isInstanceOf(OrderReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderReference.builder().obj(new com.commercetools.api.models.order.OrderImpl()) },
-                new Object[] { OrderReference.builder().id("id") } };
+                new Object[] { "obj",
+                        OrderReference.builder().obj(new com.commercetools.api.models.order.OrderImpl()) },
+                new Object[] { "id", OrderReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemoveDeliveryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemoveDeliveryActionTest.java
index 89e7835952e..c868d4a6a8c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemoveDeliveryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemoveDeliveryActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderRemoveDeliveryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderRemoveDeliveryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderRemoveDeliveryActionBuilder builder) {
         OrderRemoveDeliveryAction orderRemoveDeliveryAction = builder.buildUnchecked();
         Assertions.assertThat(orderRemoveDeliveryAction).isInstanceOf(OrderRemoveDeliveryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderRemoveDeliveryAction.builder().deliveryId("deliveryId") },
-                new Object[] { OrderRemoveDeliveryAction.builder().deliveryKey("deliveryKey") } };
+        return new Object[][] {
+                new Object[] { "deliveryId", OrderRemoveDeliveryAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey", OrderRemoveDeliveryAction.builder().deliveryKey("deliveryKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemoveItemShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemoveItemShippingAddressActionTest.java
index f2551686dda..547ad5b07c4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemoveItemShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemoveItemShippingAddressActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderRemoveItemShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderRemoveItemShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderRemoveItemShippingAddressActionBuilder builder) {
         OrderRemoveItemShippingAddressAction orderRemoveItemShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(orderRemoveItemShippingAddressAction)
                 .isInstanceOf(OrderRemoveItemShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { OrderRemoveItemShippingAddressAction.builder().addressKey("addressKey") } };
+        return new Object[][] { new Object[] { "addressKey",
+                OrderRemoveItemShippingAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemoveParcelFromDeliveryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemoveParcelFromDeliveryActionTest.java
index bbb4770a39d..536fd35ce81 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemoveParcelFromDeliveryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemoveParcelFromDeliveryActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderRemoveParcelFromDeliveryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderRemoveParcelFromDeliveryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderRemoveParcelFromDeliveryActionBuilder builder) {
         OrderRemoveParcelFromDeliveryAction orderRemoveParcelFromDeliveryAction = builder.buildUnchecked();
         Assertions.assertThat(orderRemoveParcelFromDeliveryAction)
                 .isInstanceOf(OrderRemoveParcelFromDeliveryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderRemoveParcelFromDeliveryAction.builder().parcelId("parcelId") },
-                new Object[] { OrderRemoveParcelFromDeliveryAction.builder().parcelKey("parcelKey") } };
+        return new Object[][] {
+                new Object[] { "parcelId", OrderRemoveParcelFromDeliveryAction.builder().parcelId("parcelId") },
+                new Object[] { "parcelKey", OrderRemoveParcelFromDeliveryAction.builder().parcelKey("parcelKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemovePaymentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemovePaymentActionTest.java
index a795c2bfd3b..7d36fb9b6a5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemovePaymentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderRemovePaymentActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderRemovePaymentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderRemovePaymentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderRemovePaymentActionBuilder builder) {
         OrderRemovePaymentAction orderRemovePaymentAction = builder.buildUnchecked();
         Assertions.assertThat(orderRemovePaymentAction).isInstanceOf(OrderRemovePaymentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderRemovePaymentAction.builder()
+        return new Object[][] { new Object[] { "payment", OrderRemovePaymentAction.builder()
                 .payment(new com.commercetools.api.models.payment.PaymentResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchAndExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchAndExpressionTest.java
index 80262714c6f..30b2892f26e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchAndExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchAndExpressionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchAndExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchAndExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchAndExpressionBuilder builder) {
         OrderSearchAndExpression orderSearchAndExpression = builder.buildUnchecked();
         Assertions.assertThat(orderSearchAndExpression).isInstanceOf(OrderSearchAndExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchAndExpression.builder()
+        return new Object[][] { new Object[] { "and", OrderSearchAndExpression.builder()
                 .and(Collections.singletonList(new com.commercetools.api.models.order.OrderSearchQueryImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchAnyValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchAnyValueTest.java
index c77001c0ca3..63c7d3ea423 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchAnyValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchAnyValueTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchAnyValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchAnyValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchAnyValueBuilder builder) {
         OrderSearchAnyValue orderSearchAnyValue = builder.buildUnchecked();
         Assertions.assertThat(orderSearchAnyValue).isInstanceOf(OrderSearchAnyValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchAnyValue.builder().value("value") },
-                new Object[] { OrderSearchAnyValue.builder().language("language") },
-                new Object[] { OrderSearchAnyValue.builder().caseInsensitive(true) } };
+        return new Object[][] { new Object[] { "value", OrderSearchAnyValue.builder().value("value") },
+                new Object[] { "language", OrderSearchAnyValue.builder().language("language") },
+                new Object[] { "caseInsensitive", OrderSearchAnyValue.builder().caseInsensitive(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchCompoundExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchCompoundExpressionTest.java
index 8ff5115751d..e10ceb19ef7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchCompoundExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchCompoundExpressionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchCompoundExpressionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchDateRangeExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchDateRangeExpressionTest.java
index e341bb88718..72f299eda58 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchDateRangeExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchDateRangeExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchDateRangeExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchDateRangeExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchDateRangeExpressionBuilder builder) {
         OrderSearchDateRangeExpression orderSearchDateRangeExpression = builder.buildUnchecked();
         Assertions.assertThat(orderSearchDateRangeExpression).isInstanceOf(OrderSearchDateRangeExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchDateRangeExpression.builder()
+        return new Object[][] { new Object[] { "range", OrderSearchDateRangeExpression.builder()
                 .range(new com.commercetools.api.models.order.OrderSearchDateRangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchDateRangeValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchDateRangeValueTest.java
index 1315e75772c..55cfe040fa9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchDateRangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchDateRangeValueTest.java
@@ -3,32 +3,26 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchDateRangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchDateRangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchDateRangeValueBuilder builder) {
         OrderSearchDateRangeValue orderSearchDateRangeValue = builder.buildUnchecked();
         Assertions.assertThat(orderSearchDateRangeValue).isInstanceOf(OrderSearchDateRangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSearchDateRangeValue.builder().gte(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { OrderSearchDateRangeValue.builder().lte(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "gte",
+                        OrderSearchDateRangeValue.builder().gte(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lte",
+                        OrderSearchDateRangeValue.builder().lte(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchExactExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchExactExpressionTest.java
index b7f9b62c37e..b210e906dd3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchExactExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchExactExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchExactExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchExactExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchExactExpressionBuilder builder) {
         OrderSearchExactExpression orderSearchExactExpression = builder.buildUnchecked();
         Assertions.assertThat(orderSearchExactExpression).isInstanceOf(OrderSearchExactExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchExactExpression.builder()
+        return new Object[][] { new Object[] { "exact", OrderSearchExactExpression.builder()
                 .exact(new com.commercetools.api.models.order.OrderSearchAnyValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchExistsExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchExistsExpressionTest.java
index 09cceaa746d..3fea3c0375c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchExistsExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchExistsExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchExistsExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchExistsExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchExistsExpressionBuilder builder) {
         OrderSearchExistsExpression orderSearchExistsExpression = builder.buildUnchecked();
         Assertions.assertThat(orderSearchExistsExpression).isInstanceOf(OrderSearchExistsExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchExistsExpression.builder()
+        return new Object[][] { new Object[] { "exists", OrderSearchExistsExpression.builder()
                 .exists(new com.commercetools.api.models.order.OrderSearchQueryExpressionValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchFilterExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchFilterExpressionTest.java
index 601b910ab98..28b4016d678 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchFilterExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchFilterExpressionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchFilterExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchFilterExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchFilterExpressionBuilder builder) {
         OrderSearchFilterExpression orderSearchFilterExpression = builder.buildUnchecked();
         Assertions.assertThat(orderSearchFilterExpression).isInstanceOf(OrderSearchFilterExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchFilterExpression.builder()
-                .filter(Collections
-                        .singletonList(new com.commercetools.api.models.order.OrderSearchQueryExpressionImpl())) } };
+        return new Object[][] { new Object[] { "filter",
+                OrderSearchFilterExpression.builder()
+                        .filter(Collections.singletonList(
+                            new com.commercetools.api.models.order.OrderSearchQueryExpressionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchFullTextExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchFullTextExpressionTest.java
index 29342a8187e..06a87f3af20 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchFullTextExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchFullTextExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchFullTextExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchFullTextExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchFullTextExpressionBuilder builder) {
         OrderSearchFullTextExpression orderSearchFullTextExpression = builder.buildUnchecked();
         Assertions.assertThat(orderSearchFullTextExpression).isInstanceOf(OrderSearchFullTextExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchFullTextExpression.builder()
+        return new Object[][] { new Object[] { "fullText", OrderSearchFullTextExpression.builder()
                 .fullText(new com.commercetools.api.models.order.OrderSearchFullTextValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchFullTextValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchFullTextValueTest.java
index d34efa96fc6..9962184cb11 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchFullTextValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchFullTextValueTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchFullTextValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchFullTextValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchFullTextValueBuilder builder) {
         OrderSearchFullTextValue orderSearchFullTextValue = builder.buildUnchecked();
         Assertions.assertThat(orderSearchFullTextValue).isInstanceOf(OrderSearchFullTextValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchFullTextValue.builder().value("value") },
-                new Object[] { OrderSearchFullTextValue.builder().language("language") },
-                new Object[] { OrderSearchFullTextValue.builder()
+        return new Object[][] { new Object[] { "value", OrderSearchFullTextValue.builder().value("value") },
+                new Object[] { "language", OrderSearchFullTextValue.builder().language("language") },
+                new Object[] { "mustMatch", OrderSearchFullTextValue.builder()
                         .mustMatch(com.commercetools.api.models.order.OrderSearchMatchType.findEnum("any")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchLongRangeExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchLongRangeExpressionTest.java
index d6f1cc53d06..e1704650735 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchLongRangeExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchLongRangeExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchLongRangeExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchLongRangeExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchLongRangeExpressionBuilder builder) {
         OrderSearchLongRangeExpression orderSearchLongRangeExpression = builder.buildUnchecked();
         Assertions.assertThat(orderSearchLongRangeExpression).isInstanceOf(OrderSearchLongRangeExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchLongRangeExpression.builder()
+        return new Object[][] { new Object[] { "range", OrderSearchLongRangeExpression.builder()
                 .range(new com.commercetools.api.models.order.OrderSearchLongRangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchLongRangeValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchLongRangeValueTest.java
index d92c4b6c299..b62418a00d6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchLongRangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchLongRangeValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchLongRangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchLongRangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchLongRangeValueBuilder builder) {
         OrderSearchLongRangeValue orderSearchLongRangeValue = builder.buildUnchecked();
         Assertions.assertThat(orderSearchLongRangeValue).isInstanceOf(OrderSearchLongRangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchLongRangeValue.builder().gte(8L) },
-                new Object[] { OrderSearchLongRangeValue.builder().lte(1L) } };
+        return new Object[][] { new Object[] { "gte", OrderSearchLongRangeValue.builder().gte(8L) },
+                new Object[] { "lte", OrderSearchLongRangeValue.builder().lte(1L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchNotExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchNotExpressionTest.java
index 91ca003a452..3a2857fe18e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchNotExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchNotExpressionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchNotExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchNotExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchNotExpressionBuilder builder) {
         OrderSearchNotExpression orderSearchNotExpression = builder.buildUnchecked();
         Assertions.assertThat(orderSearchNotExpression).isInstanceOf(OrderSearchNotExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchNotExpression.builder()
+        return new Object[][] { new Object[] { "not", OrderSearchNotExpression.builder()
                 .not(Collections.singletonList(new com.commercetools.api.models.order.OrderSearchQueryImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchNumberRangeExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchNumberRangeExpressionTest.java
index 9f111fded7f..354056165df 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchNumberRangeExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchNumberRangeExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchNumberRangeExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchNumberRangeExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchNumberRangeExpressionBuilder builder) {
         OrderSearchNumberRangeExpression orderSearchNumberRangeExpression = builder.buildUnchecked();
         Assertions.assertThat(orderSearchNumberRangeExpression).isInstanceOf(OrderSearchNumberRangeExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchNumberRangeExpression.builder()
+        return new Object[][] { new Object[] { "range", OrderSearchNumberRangeExpression.builder()
                 .range(new com.commercetools.api.models.order.OrderSearchNumberRangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchNumberRangeValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchNumberRangeValueTest.java
index 017fa105630..1154879e919 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchNumberRangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchNumberRangeValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchNumberRangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchNumberRangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchNumberRangeValueBuilder builder) {
         OrderSearchNumberRangeValue orderSearchNumberRangeValue = builder.buildUnchecked();
         Assertions.assertThat(orderSearchNumberRangeValue).isInstanceOf(OrderSearchNumberRangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchNumberRangeValue.builder().gte(0.8498576) },
-                new Object[] { OrderSearchNumberRangeValue.builder().lte(0.26076245) } };
+        return new Object[][] { new Object[] { "gte", OrderSearchNumberRangeValue.builder().gte(0.8498576) },
+                new Object[] { "lte", OrderSearchNumberRangeValue.builder().lte(0.26076245) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchOrExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchOrExpressionTest.java
index 643538acd5b..052b1407ba6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchOrExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchOrExpressionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchOrExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchOrExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchOrExpressionBuilder builder) {
         OrderSearchOrExpression orderSearchOrExpression = builder.buildUnchecked();
         Assertions.assertThat(orderSearchOrExpression).isInstanceOf(OrderSearchOrExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchOrExpression.builder()
+        return new Object[][] { new Object[] { "or", OrderSearchOrExpression.builder()
                 .or(Collections.singletonList(new com.commercetools.api.models.order.OrderSearchQueryImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchPrefixExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchPrefixExpressionTest.java
index b2aac15128c..24e1e785bc9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchPrefixExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchPrefixExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchPrefixExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchPrefixExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchPrefixExpressionBuilder builder) {
         OrderSearchPrefixExpression orderSearchPrefixExpression = builder.buildUnchecked();
         Assertions.assertThat(orderSearchPrefixExpression).isInstanceOf(OrderSearchPrefixExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchPrefixExpression.builder()
+        return new Object[][] { new Object[] { "prefix", OrderSearchPrefixExpression.builder()
                 .prefix(new com.commercetools.api.models.order.OrderSearchStringValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchQueryExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchQueryExpressionTest.java
index 2dbd7dedfb7..c8b56b81804 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchQueryExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchQueryExpressionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchQueryExpressionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchQueryExpressionValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchQueryExpressionValueTest.java
index 8ba64ff463a..bf299dab4ea 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchQueryExpressionValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchQueryExpressionValueTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchQueryExpressionValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchQueryExpressionValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchQueryExpressionValueBuilder builder) {
         OrderSearchQueryExpressionValue orderSearchQueryExpressionValue = builder.buildUnchecked();
         Assertions.assertThat(orderSearchQueryExpressionValue).isInstanceOf(OrderSearchQueryExpressionValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchQueryExpressionValue.builder().field("field") },
-                new Object[] { OrderSearchQueryExpressionValue.builder().boost(7) },
-                new Object[] { OrderSearchQueryExpressionValue.builder()
+        return new Object[][] { new Object[] { "field", OrderSearchQueryExpressionValue.builder().field("field") },
+                new Object[] { "boost", OrderSearchQueryExpressionValue.builder().boost(7) },
+                new Object[] { "customType", OrderSearchQueryExpressionValue.builder()
                         .customType(
                             com.commercetools.api.models.order.OrderSearchCustomType.findEnum("BooleanType")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchQueryTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchQueryTest.java
index 156d2d617e8..9fb2f491dad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchQueryTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchQueryTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchQueryTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchRequestTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchRequestTest.java
index ae2e7d5c9b8..7bcd8047f79 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchRequestTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchRequestTest.java
@@ -3,37 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchRequestBuilder builder) {
         OrderSearchRequest orderSearchRequest = builder.buildUnchecked();
         Assertions.assertThat(orderSearchRequest).isInstanceOf(OrderSearchRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSearchRequest.builder()
-                        .query(new com.commercetools.api.models.order.OrderSearchQueryImpl()) },
-                new Object[] { OrderSearchRequest.builder()
-                        .sort(Collections
-                                .singletonList(new com.commercetools.api.models.order.OrderSearchSortingImpl())) },
-                new Object[] { OrderSearchRequest.builder().limit(7) },
-                new Object[] { OrderSearchRequest.builder().offset(3) } };
+                new Object[] { "query",
+                        OrderSearchRequest.builder()
+                                .query(new com.commercetools.api.models.order.OrderSearchQueryImpl()) },
+                new Object[] { "sort",
+                        OrderSearchRequest.builder()
+                                .sort(Collections.singletonList(
+                                    new com.commercetools.api.models.order.OrderSearchSortingImpl())) },
+                new Object[] { "limit", OrderSearchRequest.builder().limit(7) },
+                new Object[] { "offset", OrderSearchRequest.builder().offset(3) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchSortingTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchSortingTest.java
index 47373f48c05..574398792d5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchSortingTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchSortingTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchSortingTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchSortingBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchSortingBuilder builder) {
         OrderSearchSorting orderSearchSorting = builder.buildUnchecked();
         Assertions.assertThat(orderSearchSorting).isInstanceOf(OrderSearchSorting.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchSorting.builder().field("field") },
-                new Object[] { OrderSearchSorting.builder().language("language") },
-                new Object[] { OrderSearchSorting.builder()
-                        .order(com.commercetools.api.models.order.OrderSearchSortOrder.findEnum("asc")) },
-                new Object[] { OrderSearchSorting.builder()
-                        .mode(com.commercetools.api.models.order.OrderSearchSortMode.findEnum("min")) },
-                new Object[] { OrderSearchSorting.builder()
+        return new Object[][] { new Object[] { "field", OrderSearchSorting.builder().field("field") },
+                new Object[] { "language", OrderSearchSorting.builder().language("language") },
+                new Object[] { "order",
+                        OrderSearchSorting.builder()
+                                .order(com.commercetools.api.models.order.OrderSearchSortOrder.findEnum("asc")) },
+                new Object[] { "mode",
+                        OrderSearchSorting.builder()
+                                .mode(com.commercetools.api.models.order.OrderSearchSortMode.findEnum("min")) },
+                new Object[] { "filter", OrderSearchSorting.builder()
                         .filter(new com.commercetools.api.models.order.OrderSearchQueryExpressionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchStringValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchStringValueTest.java
index b05a629e43c..458057d5eef 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchStringValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchStringValueTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchStringValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchStringValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchStringValueBuilder builder) {
         OrderSearchStringValue orderSearchStringValue = builder.buildUnchecked();
         Assertions.assertThat(orderSearchStringValue).isInstanceOf(OrderSearchStringValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchStringValue.builder().value("value") },
-                new Object[] { OrderSearchStringValue.builder().language("language") },
-                new Object[] { OrderSearchStringValue.builder().caseInsensitive(true) } };
+        return new Object[][] { new Object[] { "value", OrderSearchStringValue.builder().value("value") },
+                new Object[] { "language", OrderSearchStringValue.builder().language("language") },
+                new Object[] { "caseInsensitive", OrderSearchStringValue.builder().caseInsensitive(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchWildCardExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchWildCardExpressionTest.java
index 1d11dfcea1b..bf301be134d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchWildCardExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSearchWildCardExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSearchWildCardExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSearchWildCardExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSearchWildCardExpressionBuilder builder) {
         OrderSearchWildCardExpression orderSearchWildCardExpression = builder.buildUnchecked();
         Assertions.assertThat(orderSearchWildCardExpression).isInstanceOf(OrderSearchWildCardExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSearchWildCardExpression.builder()
+        return new Object[][] { new Object[] { "wildcard", OrderSearchWildCardExpression.builder()
                 .wildcard(new com.commercetools.api.models.order.OrderSearchStringValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBillingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBillingAddressActionTest.java
index 1817ef78beb..3751c45340c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBillingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBillingAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetBillingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetBillingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetBillingAddressActionBuilder builder) {
         OrderSetBillingAddressAction orderSetBillingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetBillingAddressAction).isInstanceOf(OrderSetBillingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetBillingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", OrderSetBillingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBillingAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBillingAddressCustomFieldActionTest.java
index 6ef8aa8c0cb..d044c51f14a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBillingAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBillingAddressCustomFieldActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetBillingAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetBillingAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetBillingAddressCustomFieldActionBuilder builder) {
         OrderSetBillingAddressCustomFieldAction orderSetBillingAddressCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetBillingAddressCustomFieldAction)
                 .isInstanceOf(OrderSetBillingAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetBillingAddressCustomFieldAction.builder().name("name") },
-                new Object[] { OrderSetBillingAddressCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", OrderSetBillingAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", OrderSetBillingAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBillingAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBillingAddressCustomTypeActionTest.java
index 3abda92234a..84bcad3f8a4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBillingAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBillingAddressCustomTypeActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetBillingAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetBillingAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetBillingAddressCustomTypeActionBuilder builder) {
         OrderSetBillingAddressCustomTypeAction orderSetBillingAddressCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetBillingAddressCustomTypeAction)
                 .isInstanceOf(OrderSetBillingAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetBillingAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { OrderSetBillingAddressCustomTypeAction.builder()
+                new Object[] { "type",
+                        OrderSetBillingAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", OrderSetBillingAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBusinessUnitActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBusinessUnitActionTest.java
index 1fbd8d2b73a..b680ea20e0b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBusinessUnitActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetBusinessUnitActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetBusinessUnitActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetBusinessUnitActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetBusinessUnitActionBuilder builder) {
         OrderSetBusinessUnitAction orderSetBusinessUnitAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetBusinessUnitAction).isInstanceOf(OrderSetBusinessUnitAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetBusinessUnitAction.builder()
+        return new Object[][] { new Object[] { "businessUnit", OrderSetBusinessUnitAction.builder()
                 .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomFieldActionTest.java
index 2f5d39b3114..a3154f66023 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetCustomFieldActionBuilder builder) {
         OrderSetCustomFieldAction orderSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetCustomFieldAction).isInstanceOf(OrderSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetCustomFieldAction.builder().name("name") },
-                new Object[] { OrderSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", OrderSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", OrderSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomLineItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomLineItemCustomFieldActionTest.java
index c07837fa4fd..a6d8d817d69 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomLineItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomLineItemCustomFieldActionTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetCustomLineItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetCustomLineItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetCustomLineItemCustomFieldActionBuilder builder) {
         OrderSetCustomLineItemCustomFieldAction orderSetCustomLineItemCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetCustomLineItemCustomFieldAction)
                 .isInstanceOf(OrderSetCustomLineItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetCustomLineItemCustomFieldAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemId",
+                        OrderSetCustomLineItemCustomFieldAction.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
                         OrderSetCustomLineItemCustomFieldAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { OrderSetCustomLineItemCustomFieldAction.builder().name("name") },
-                new Object[] { OrderSetCustomLineItemCustomFieldAction.builder().value("value") } };
+                new Object[] { "name", OrderSetCustomLineItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", OrderSetCustomLineItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomLineItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomLineItemCustomTypeActionTest.java
index cd46c14db2d..a613b1478d2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomLineItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomLineItemCustomTypeActionTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetCustomLineItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetCustomLineItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetCustomLineItemCustomTypeActionBuilder builder) {
         OrderSetCustomLineItemCustomTypeAction orderSetCustomLineItemCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetCustomLineItemCustomTypeAction)
                 .isInstanceOf(OrderSetCustomLineItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetCustomLineItemCustomTypeAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemId",
+                        OrderSetCustomLineItemCustomTypeAction.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
                         OrderSetCustomLineItemCustomTypeAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { OrderSetCustomLineItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { OrderSetCustomLineItemCustomTypeAction.builder()
+                new Object[] { "type",
+                        OrderSetCustomLineItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", OrderSetCustomLineItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomLineItemShippingDetailsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomLineItemShippingDetailsActionTest.java
index fb19abcf4e2..bfab415cfad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomLineItemShippingDetailsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomLineItemShippingDetailsActionTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetCustomLineItemShippingDetailsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetCustomLineItemShippingDetailsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetCustomLineItemShippingDetailsActionBuilder builder) {
         OrderSetCustomLineItemShippingDetailsAction orderSetCustomLineItemShippingDetailsAction = builder
                 .buildUnchecked();
         Assertions.assertThat(orderSetCustomLineItemShippingDetailsAction)
                 .isInstanceOf(OrderSetCustomLineItemShippingDetailsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         OrderSetCustomLineItemShippingDetailsAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemKey",
                         OrderSetCustomLineItemShippingDetailsAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { OrderSetCustomLineItemShippingDetailsAction.builder()
+                new Object[] { "shippingDetails", OrderSetCustomLineItemShippingDetailsAction.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomTypeActionTest.java
index b85f4c8daa3..10387d37635 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetCustomTypeActionBuilder builder) {
         OrderSetCustomTypeAction orderSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetCustomTypeAction).isInstanceOf(OrderSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { OrderSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        OrderSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", OrderSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomerEmailActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomerEmailActionTest.java
index 40de66009c9..6e779f70203 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomerEmailActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomerEmailActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetCustomerEmailActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetCustomerEmailActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetCustomerEmailActionBuilder builder) {
         OrderSetCustomerEmailAction orderSetCustomerEmailAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetCustomerEmailAction).isInstanceOf(OrderSetCustomerEmailAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetCustomerEmailAction.builder().email("email") } };
+        return new Object[][] { new Object[] { "email", OrderSetCustomerEmailAction.builder().email("email") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomerIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomerIdActionTest.java
index fd105919b74..2c365d2e0ca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomerIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetCustomerIdActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetCustomerIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetCustomerIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetCustomerIdActionBuilder builder) {
         OrderSetCustomerIdAction orderSetCustomerIdAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetCustomerIdAction).isInstanceOf(OrderSetCustomerIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetCustomerIdAction.builder().customerId("customerId") } };
+        return new Object[][] {
+                new Object[] { "customerId", OrderSetCustomerIdAction.builder().customerId("customerId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryAddressActionTest.java
index 6629a9d8ed7..79fb83fe3a4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryAddressActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetDeliveryAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetDeliveryAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetDeliveryAddressActionBuilder builder) {
         OrderSetDeliveryAddressAction orderSetDeliveryAddressAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetDeliveryAddressAction).isInstanceOf(OrderSetDeliveryAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetDeliveryAddressAction.builder().deliveryId("deliveryId") },
-                new Object[] { OrderSetDeliveryAddressAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { OrderSetDeliveryAddressAction.builder()
+        return new Object[][] {
+                new Object[] { "deliveryId", OrderSetDeliveryAddressAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey", OrderSetDeliveryAddressAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "address", OrderSetDeliveryAddressAction.builder()
                         .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryAddressCustomFieldActionTest.java
index 20c926b770d..3bad4db12ef 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryAddressCustomFieldActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetDeliveryAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetDeliveryAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetDeliveryAddressCustomFieldActionBuilder builder) {
         OrderSetDeliveryAddressCustomFieldAction orderSetDeliveryAddressCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetDeliveryAddressCustomFieldAction)
                 .isInstanceOf(OrderSetDeliveryAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetDeliveryAddressCustomFieldAction.builder().deliveryId("deliveryId") },
-                new Object[] { OrderSetDeliveryAddressCustomFieldAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { OrderSetDeliveryAddressCustomFieldAction.builder().name("name") },
-                new Object[] { OrderSetDeliveryAddressCustomFieldAction.builder().value("value") } };
+                new Object[] { "deliveryId",
+                        OrderSetDeliveryAddressCustomFieldAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey",
+                        OrderSetDeliveryAddressCustomFieldAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "name", OrderSetDeliveryAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", OrderSetDeliveryAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryAddressCustomTypeActionTest.java
index d770108c716..f8631a36fe9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryAddressCustomTypeActionTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetDeliveryAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetDeliveryAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetDeliveryAddressCustomTypeActionBuilder builder) {
         OrderSetDeliveryAddressCustomTypeAction orderSetDeliveryAddressCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetDeliveryAddressCustomTypeAction)
                 .isInstanceOf(OrderSetDeliveryAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetDeliveryAddressCustomTypeAction.builder().deliveryId("deliveryId") },
-                new Object[] { OrderSetDeliveryAddressCustomTypeAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { OrderSetDeliveryAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { OrderSetDeliveryAddressCustomTypeAction.builder()
+                new Object[] { "deliveryId",
+                        OrderSetDeliveryAddressCustomTypeAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey",
+                        OrderSetDeliveryAddressCustomTypeAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "type",
+                        OrderSetDeliveryAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", OrderSetDeliveryAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryCustomFieldActionTest.java
index 3df44a591ae..ade92bebcd3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryCustomFieldActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetDeliveryCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetDeliveryCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetDeliveryCustomFieldActionBuilder builder) {
         OrderSetDeliveryCustomFieldAction orderSetDeliveryCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetDeliveryCustomFieldAction).isInstanceOf(OrderSetDeliveryCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetDeliveryCustomFieldAction.builder().deliveryId("deliveryId") },
-                new Object[] { OrderSetDeliveryCustomFieldAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { OrderSetDeliveryCustomFieldAction.builder().name("name") },
-                new Object[] { OrderSetDeliveryCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "deliveryId", OrderSetDeliveryCustomFieldAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey", OrderSetDeliveryCustomFieldAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "name", OrderSetDeliveryCustomFieldAction.builder().name("name") },
+                new Object[] { "value", OrderSetDeliveryCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryCustomTypeActionTest.java
index 61089f45ce2..09c0e58adfb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryCustomTypeActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetDeliveryCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetDeliveryCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetDeliveryCustomTypeActionBuilder builder) {
         OrderSetDeliveryCustomTypeAction orderSetDeliveryCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetDeliveryCustomTypeAction).isInstanceOf(OrderSetDeliveryCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetDeliveryCustomTypeAction.builder().deliveryId("deliveryId") },
-                new Object[] { OrderSetDeliveryCustomTypeAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { OrderSetDeliveryCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { OrderSetDeliveryCustomTypeAction.builder()
+        return new Object[][] {
+                new Object[] { "deliveryId", OrderSetDeliveryCustomTypeAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey", OrderSetDeliveryCustomTypeAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "type",
+                        OrderSetDeliveryCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", OrderSetDeliveryCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryItemsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryItemsActionTest.java
index 632956e843e..ddf6b348312 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryItemsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetDeliveryItemsActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetDeliveryItemsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetDeliveryItemsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetDeliveryItemsActionBuilder builder) {
         OrderSetDeliveryItemsAction orderSetDeliveryItemsAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetDeliveryItemsAction).isInstanceOf(OrderSetDeliveryItemsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetDeliveryItemsAction.builder().deliveryId("deliveryId") },
-                new Object[] { OrderSetDeliveryItemsAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { OrderSetDeliveryItemsAction.builder()
+        return new Object[][] {
+                new Object[] { "deliveryId", OrderSetDeliveryItemsAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey", OrderSetDeliveryItemsAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "items", OrderSetDeliveryItemsAction.builder()
                         .items(
                             Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetItemShippingAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetItemShippingAddressCustomFieldActionTest.java
index 30d1cec1f8d..9af51b849f3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetItemShippingAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetItemShippingAddressCustomFieldActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetItemShippingAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetItemShippingAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetItemShippingAddressCustomFieldActionBuilder builder) {
         OrderSetItemShippingAddressCustomFieldAction orderSetItemShippingAddressCustomFieldAction = builder
                 .buildUnchecked();
         Assertions.assertThat(orderSetItemShippingAddressCustomFieldAction)
                 .isInstanceOf(OrderSetItemShippingAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetItemShippingAddressCustomFieldAction.builder().addressKey("addressKey") },
-                new Object[] { OrderSetItemShippingAddressCustomFieldAction.builder().name("name") },
-                new Object[] { OrderSetItemShippingAddressCustomFieldAction.builder().value("value") } };
+                new Object[] { "addressKey",
+                        OrderSetItemShippingAddressCustomFieldAction.builder().addressKey("addressKey") },
+                new Object[] { "name", OrderSetItemShippingAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", OrderSetItemShippingAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetItemShippingAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetItemShippingAddressCustomTypeActionTest.java
index 9fc4314e5d2..b8084f6befd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetItemShippingAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetItemShippingAddressCustomTypeActionTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetItemShippingAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetItemShippingAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetItemShippingAddressCustomTypeActionBuilder builder) {
         OrderSetItemShippingAddressCustomTypeAction orderSetItemShippingAddressCustomTypeAction = builder
                 .buildUnchecked();
         Assertions.assertThat(orderSetItemShippingAddressCustomTypeAction)
                 .isInstanceOf(OrderSetItemShippingAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetItemShippingAddressCustomTypeAction.builder().addressKey("addressKey") },
-                new Object[] { OrderSetItemShippingAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { OrderSetItemShippingAddressCustomTypeAction.builder()
+                new Object[] { "addressKey",
+                        OrderSetItemShippingAddressCustomTypeAction.builder().addressKey("addressKey") },
+                new Object[] { "type",
+                        OrderSetItemShippingAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", OrderSetItemShippingAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLineItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLineItemCustomFieldActionTest.java
index 86e114d7696..b8880f8c584 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLineItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLineItemCustomFieldActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetLineItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetLineItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetLineItemCustomFieldActionBuilder builder) {
         OrderSetLineItemCustomFieldAction orderSetLineItemCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetLineItemCustomFieldAction).isInstanceOf(OrderSetLineItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetLineItemCustomFieldAction.builder().lineItemId("lineItemId") },
-                new Object[] { OrderSetLineItemCustomFieldAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { OrderSetLineItemCustomFieldAction.builder().name("name") },
-                new Object[] { OrderSetLineItemCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "lineItemId", OrderSetLineItemCustomFieldAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", OrderSetLineItemCustomFieldAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "name", OrderSetLineItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", OrderSetLineItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLineItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLineItemCustomTypeActionTest.java
index 1e6f257ea44..c11815a78d2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLineItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLineItemCustomTypeActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetLineItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetLineItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetLineItemCustomTypeActionBuilder builder) {
         OrderSetLineItemCustomTypeAction orderSetLineItemCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetLineItemCustomTypeAction).isInstanceOf(OrderSetLineItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetLineItemCustomTypeAction.builder().lineItemId("lineItemId") },
-                new Object[] { OrderSetLineItemCustomTypeAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { OrderSetLineItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { OrderSetLineItemCustomTypeAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", OrderSetLineItemCustomTypeAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", OrderSetLineItemCustomTypeAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "type",
+                        OrderSetLineItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", OrderSetLineItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLineItemShippingDetailsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLineItemShippingDetailsActionTest.java
index 1e4d01fb52f..48ad69ba6d9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLineItemShippingDetailsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLineItemShippingDetailsActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetLineItemShippingDetailsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetLineItemShippingDetailsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetLineItemShippingDetailsActionBuilder builder) {
         OrderSetLineItemShippingDetailsAction orderSetLineItemShippingDetailsAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetLineItemShippingDetailsAction)
                 .isInstanceOf(OrderSetLineItemShippingDetailsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetLineItemShippingDetailsAction.builder().lineItemId("lineItemId") },
-                new Object[] { OrderSetLineItemShippingDetailsAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { OrderSetLineItemShippingDetailsAction.builder()
+                new Object[] { "lineItemId", OrderSetLineItemShippingDetailsAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        OrderSetLineItemShippingDetailsAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "shippingDetails", OrderSetLineItemShippingDetailsAction.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLocaleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLocaleActionTest.java
index 64e5e67d4ec..c8b50a2cbeb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLocaleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetLocaleActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetLocaleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetLocaleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetLocaleActionBuilder builder) {
         OrderSetLocaleAction orderSetLocaleAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetLocaleAction).isInstanceOf(OrderSetLocaleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetLocaleAction.builder().locale("locale") } };
+        return new Object[][] { new Object[] { "locale", OrderSetLocaleAction.builder().locale("locale") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetOrderNumberActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetOrderNumberActionTest.java
index 627de72d3bf..4a3a09cb16f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetOrderNumberActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetOrderNumberActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetOrderNumberActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetOrderNumberActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetOrderNumberActionBuilder builder) {
         OrderSetOrderNumberAction orderSetOrderNumberAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetOrderNumberAction).isInstanceOf(OrderSetOrderNumberAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetOrderNumberAction.builder().orderNumber("orderNumber") } };
+        return new Object[][] {
+                new Object[] { "orderNumber", OrderSetOrderNumberAction.builder().orderNumber("orderNumber") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelCustomFieldActionTest.java
index 0b0779f1174..cfe9e933159 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelCustomFieldActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetParcelCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetParcelCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetParcelCustomFieldActionBuilder builder) {
         OrderSetParcelCustomFieldAction orderSetParcelCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetParcelCustomFieldAction).isInstanceOf(OrderSetParcelCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetParcelCustomFieldAction.builder().parcelId("parcelId") },
-                new Object[] { OrderSetParcelCustomFieldAction.builder().parcelKey("parcelKey") },
-                new Object[] { OrderSetParcelCustomFieldAction.builder().name("name") },
-                new Object[] { OrderSetParcelCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "parcelId", OrderSetParcelCustomFieldAction.builder().parcelId("parcelId") },
+                new Object[] { "parcelKey", OrderSetParcelCustomFieldAction.builder().parcelKey("parcelKey") },
+                new Object[] { "name", OrderSetParcelCustomFieldAction.builder().name("name") },
+                new Object[] { "value", OrderSetParcelCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelCustomTypeActionTest.java
index d5492ea3c22..10607020cf7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelCustomTypeActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetParcelCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetParcelCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetParcelCustomTypeActionBuilder builder) {
         OrderSetParcelCustomTypeAction orderSetParcelCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetParcelCustomTypeAction).isInstanceOf(OrderSetParcelCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetParcelCustomTypeAction.builder().parcelId("parcelId") },
-                new Object[] { OrderSetParcelCustomTypeAction.builder().parcelKey("parcelKey") },
-                new Object[] { OrderSetParcelCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { OrderSetParcelCustomTypeAction.builder()
+        return new Object[][] {
+                new Object[] { "parcelId", OrderSetParcelCustomTypeAction.builder().parcelId("parcelId") },
+                new Object[] { "parcelKey", OrderSetParcelCustomTypeAction.builder().parcelKey("parcelKey") },
+                new Object[] { "type",
+                        OrderSetParcelCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", OrderSetParcelCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelItemsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelItemsActionTest.java
index 84801632646..b3e00eac889 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelItemsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelItemsActionTest.java
@@ -3,32 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetParcelItemsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetParcelItemsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetParcelItemsActionBuilder builder) {
         OrderSetParcelItemsAction orderSetParcelItemsAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetParcelItemsAction).isInstanceOf(OrderSetParcelItemsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetParcelItemsAction.builder().parcelId("parcelId") },
-                new Object[] { OrderSetParcelItemsAction.builder().parcelKey("parcelKey") },
-                new Object[] { OrderSetParcelItemsAction.builder()
+        return new Object[][] { new Object[] { "parcelId", OrderSetParcelItemsAction.builder().parcelId("parcelId") },
+                new Object[] { "parcelKey", OrderSetParcelItemsAction.builder().parcelKey("parcelKey") },
+                new Object[] { "items", OrderSetParcelItemsAction.builder()
                         .items(
                             Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelMeasurementsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelMeasurementsActionTest.java
index 13b836ec7c3..0acdf5c08e3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelMeasurementsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelMeasurementsActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetParcelMeasurementsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetParcelMeasurementsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetParcelMeasurementsActionBuilder builder) {
         OrderSetParcelMeasurementsAction orderSetParcelMeasurementsAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetParcelMeasurementsAction).isInstanceOf(OrderSetParcelMeasurementsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetParcelMeasurementsAction.builder().parcelId("parcelId") },
-                new Object[] { OrderSetParcelMeasurementsAction.builder().parcelKey("parcelKey") },
-                new Object[] { OrderSetParcelMeasurementsAction.builder()
+        return new Object[][] {
+                new Object[] { "parcelId", OrderSetParcelMeasurementsAction.builder().parcelId("parcelId") },
+                new Object[] { "parcelKey", OrderSetParcelMeasurementsAction.builder().parcelKey("parcelKey") },
+                new Object[] { "measurements", OrderSetParcelMeasurementsAction.builder()
                         .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelTrackingDataActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelTrackingDataActionTest.java
index 53a8ba8ee5a..d52e9ea43f0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelTrackingDataActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetParcelTrackingDataActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetParcelTrackingDataActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetParcelTrackingDataActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetParcelTrackingDataActionBuilder builder) {
         OrderSetParcelTrackingDataAction orderSetParcelTrackingDataAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetParcelTrackingDataAction).isInstanceOf(OrderSetParcelTrackingDataAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetParcelTrackingDataAction.builder().parcelId("parcelId") },
-                new Object[] { OrderSetParcelTrackingDataAction.builder().parcelKey("parcelKey") },
-                new Object[] { OrderSetParcelTrackingDataAction.builder()
+        return new Object[][] {
+                new Object[] { "parcelId", OrderSetParcelTrackingDataAction.builder().parcelId("parcelId") },
+                new Object[] { "parcelKey", OrderSetParcelTrackingDataAction.builder().parcelKey("parcelKey") },
+                new Object[] { "trackingData", OrderSetParcelTrackingDataAction.builder()
                         .trackingData(new com.commercetools.api.models.order.TrackingDataImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetPurchaseOrderNumberActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetPurchaseOrderNumberActionTest.java
index 34a3f303c8d..19d91fbb7bc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetPurchaseOrderNumberActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetPurchaseOrderNumberActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetPurchaseOrderNumberActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetPurchaseOrderNumberActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetPurchaseOrderNumberActionBuilder builder) {
         OrderSetPurchaseOrderNumberAction orderSetPurchaseOrderNumberAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetPurchaseOrderNumberAction).isInstanceOf(OrderSetPurchaseOrderNumberAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "purchaseOrderNumber",
                 OrderSetPurchaseOrderNumberAction.builder().purchaseOrderNumber("purchaseOrderNumber") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnInfoActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnInfoActionTest.java
index 6b90256224e..00f9a464139 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnInfoActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnInfoActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetReturnInfoActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetReturnInfoActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetReturnInfoActionBuilder builder) {
         OrderSetReturnInfoAction orderSetReturnInfoAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetReturnInfoAction).isInstanceOf(OrderSetReturnInfoAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetReturnInfoAction.builder()
+        return new Object[][] { new Object[] { "items", OrderSetReturnInfoAction.builder()
                 .items(Collections.singletonList(new com.commercetools.api.models.order.ReturnInfoDraftImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnItemCustomFieldActionTest.java
index df905e5663f..83fe310bdfc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnItemCustomFieldActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetReturnItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetReturnItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetReturnItemCustomFieldActionBuilder builder) {
         OrderSetReturnItemCustomFieldAction orderSetReturnItemCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetReturnItemCustomFieldAction)
                 .isInstanceOf(OrderSetReturnItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetReturnItemCustomFieldAction.builder().returnItemId("returnItemId") },
-                new Object[] { OrderSetReturnItemCustomFieldAction.builder().returnItemKey("returnItemKey") },
-                new Object[] { OrderSetReturnItemCustomFieldAction.builder().name("name") },
-                new Object[] { OrderSetReturnItemCustomFieldAction.builder().value("value") } };
+                new Object[] { "returnItemId",
+                        OrderSetReturnItemCustomFieldAction.builder().returnItemId("returnItemId") },
+                new Object[] { "returnItemKey",
+                        OrderSetReturnItemCustomFieldAction.builder().returnItemKey("returnItemKey") },
+                new Object[] { "name", OrderSetReturnItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", OrderSetReturnItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnItemCustomTypeActionTest.java
index c182ca365b5..8472eca124b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnItemCustomTypeActionTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetReturnItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetReturnItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetReturnItemCustomTypeActionBuilder builder) {
         OrderSetReturnItemCustomTypeAction orderSetReturnItemCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetReturnItemCustomTypeAction)
                 .isInstanceOf(OrderSetReturnItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetReturnItemCustomTypeAction.builder().returnItemId("returnItemId") },
-                new Object[] { OrderSetReturnItemCustomTypeAction.builder().returnItemKey("returnItemKey") },
-                new Object[] { OrderSetReturnItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { OrderSetReturnItemCustomTypeAction.builder()
+                new Object[] { "returnItemId",
+                        OrderSetReturnItemCustomTypeAction.builder().returnItemId("returnItemId") },
+                new Object[] { "returnItemKey",
+                        OrderSetReturnItemCustomTypeAction.builder().returnItemKey("returnItemKey") },
+                new Object[] { "type",
+                        OrderSetReturnItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", OrderSetReturnItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnPaymentStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnPaymentStateActionTest.java
index 8c701215d69..b10e5e59d35 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnPaymentStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnPaymentStateActionTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetReturnPaymentStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetReturnPaymentStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetReturnPaymentStateActionBuilder builder) {
         OrderSetReturnPaymentStateAction orderSetReturnPaymentStateAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetReturnPaymentStateAction).isInstanceOf(OrderSetReturnPaymentStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetReturnPaymentStateAction.builder().returnItemId("returnItemId") },
-                new Object[] { OrderSetReturnPaymentStateAction.builder().returnItemKey("returnItemKey") },
-                new Object[] { OrderSetReturnPaymentStateAction.builder()
+                new Object[] { "returnItemId",
+                        OrderSetReturnPaymentStateAction.builder().returnItemId("returnItemId") },
+                new Object[] { "returnItemKey",
+                        OrderSetReturnPaymentStateAction.builder().returnItemKey("returnItemKey") },
+                new Object[] { "paymentState", OrderSetReturnPaymentStateAction.builder()
                         .paymentState(
                             com.commercetools.api.models.order.ReturnPaymentState.findEnum("NonRefundable")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnShipmentStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnShipmentStateActionTest.java
index c654b66041e..b965fe3e78d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnShipmentStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetReturnShipmentStateActionTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetReturnShipmentStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetReturnShipmentStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetReturnShipmentStateActionBuilder builder) {
         OrderSetReturnShipmentStateAction orderSetReturnShipmentStateAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetReturnShipmentStateAction).isInstanceOf(OrderSetReturnShipmentStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetReturnShipmentStateAction.builder().returnItemId("returnItemId") },
-                new Object[] { OrderSetReturnShipmentStateAction.builder().returnItemKey("returnItemKey") },
-                new Object[] { OrderSetReturnShipmentStateAction.builder()
+                new Object[] { "returnItemId",
+                        OrderSetReturnShipmentStateAction.builder().returnItemId("returnItemId") },
+                new Object[] { "returnItemKey",
+                        OrderSetReturnShipmentStateAction.builder().returnItemKey("returnItemKey") },
+                new Object[] { "shipmentState", OrderSetReturnShipmentStateAction.builder()
                         .shipmentState(com.commercetools.api.models.order.ReturnShipmentState.findEnum("Advised")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingAddressActionTest.java
index d3b1c9ed6c8..88dcde87977 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingAddressActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetShippingAddressActionBuilder builder) {
         OrderSetShippingAddressAction orderSetShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetShippingAddressAction).isInstanceOf(OrderSetShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetShippingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", OrderSetShippingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingAddressCustomFieldActionTest.java
index 8198a296379..cf6361dbab4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingAddressCustomFieldActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetShippingAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetShippingAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetShippingAddressCustomFieldActionBuilder builder) {
         OrderSetShippingAddressCustomFieldAction orderSetShippingAddressCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetShippingAddressCustomFieldAction)
                 .isInstanceOf(OrderSetShippingAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetShippingAddressCustomFieldAction.builder().name("name") },
-                new Object[] { OrderSetShippingAddressCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "name", OrderSetShippingAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", OrderSetShippingAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingAddressCustomTypeActionTest.java
index 11ab012c94b..abe2acc7966 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingAddressCustomTypeActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetShippingAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetShippingAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetShippingAddressCustomTypeActionBuilder builder) {
         OrderSetShippingAddressCustomTypeAction orderSetShippingAddressCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetShippingAddressCustomTypeAction)
                 .isInstanceOf(OrderSetShippingAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderSetShippingAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { OrderSetShippingAddressCustomTypeAction.builder()
+                new Object[] { "type",
+                        OrderSetShippingAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", OrderSetShippingAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingCustomFieldActionTest.java
index a335e8236f1..9601323d9c6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingCustomFieldActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetShippingCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetShippingCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetShippingCustomFieldActionBuilder builder) {
         OrderSetShippingCustomFieldAction orderSetShippingCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetShippingCustomFieldAction).isInstanceOf(OrderSetShippingCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetShippingCustomFieldAction.builder().shippingKey("shippingKey") },
-                new Object[] { OrderSetShippingCustomFieldAction.builder().name("name") },
-                new Object[] { OrderSetShippingCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "shippingKey", OrderSetShippingCustomFieldAction.builder().shippingKey("shippingKey") },
+                new Object[] { "name", OrderSetShippingCustomFieldAction.builder().name("name") },
+                new Object[] { "value", OrderSetShippingCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingCustomTypeActionTest.java
index 73202e25372..833c073cbe8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetShippingCustomTypeActionTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetShippingCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetShippingCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetShippingCustomTypeActionBuilder builder) {
         OrderSetShippingCustomTypeAction orderSetShippingCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetShippingCustomTypeAction).isInstanceOf(OrderSetShippingCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetShippingCustomTypeAction.builder().shippingKey("shippingKey") },
-                new Object[] { OrderSetShippingCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { OrderSetShippingCustomTypeAction.builder()
+        return new Object[][] {
+                new Object[] { "shippingKey", OrderSetShippingCustomTypeAction.builder().shippingKey("shippingKey") },
+                new Object[] { "type",
+                        OrderSetShippingCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", OrderSetShippingCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetStoreActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetStoreActionTest.java
index 93c5a878d52..2f13f0db7e1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetStoreActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderSetStoreActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderSetStoreActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderSetStoreActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderSetStoreActionBuilder builder) {
         OrderSetStoreAction orderSetStoreAction = builder.buildUnchecked();
         Assertions.assertThat(orderSetStoreAction).isInstanceOf(OrderSetStoreAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderSetStoreAction.builder()
+        return new Object[][] { new Object[] { "store", OrderSetStoreAction.builder()
                 .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTest.java
index 2d482aa3147..0ee95c73d14 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTest.java
@@ -4,117 +4,133 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderBuilder builder) {
         Order order = builder.buildUnchecked();
         Assertions.assertThat(order).isInstanceOf(Order.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Order.builder().id("id") }, new Object[] { Order.builder().version(2L) },
-                new Object[] { Order.builder().orderNumber("orderNumber") },
-                new Object[] { Order.builder().purchaseOrderNumber("purchaseOrderNumber") },
-                new Object[] { Order.builder().customerId("customerId") },
-                new Object[] { Order.builder().customerEmail("customerEmail") },
-                new Object[] { Order.builder()
+        return new Object[][] { new Object[] { "id", Order.builder().id("id") },
+                new Object[] { "version", Order.builder().version(2L) },
+                new Object[] { "orderNumber", Order.builder().orderNumber("orderNumber") },
+                new Object[] { "purchaseOrderNumber", Order.builder().purchaseOrderNumber("purchaseOrderNumber") },
+                new Object[] { "customerId", Order.builder().customerId("customerId") },
+                new Object[] { "customerEmail", Order.builder().customerEmail("customerEmail") },
+                new Object[] { "customerGroup", Order.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] { Order.builder().anonymousId("anonymousId") },
-                new Object[] { Order.builder()
+                new Object[] { "anonymousId", Order.builder().anonymousId("anonymousId") },
+                new Object[] { "businessUnit", Order.builder()
                         .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] { Order.builder().store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { Order.builder()
+                new Object[] { "store",
+                        Order.builder().store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "lineItems", Order.builder()
                         .lineItems(Collections.singletonList(new com.commercetools.api.models.cart.LineItemImpl())) },
-                new Object[] {
+                new Object[] { "customLineItems",
                         Order.builder()
                                 .customLineItems(Collections
                                         .singletonList(new com.commercetools.api.models.cart.CustomLineItemImpl())) },
-                new Object[] {
+                new Object[] { "totalPrice",
                         Order.builder().totalPrice(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { Order.builder().taxedPrice(new com.commercetools.api.models.cart.TaxedPriceImpl()) },
-                new Object[] {
+                new Object[] { "taxedPrice",
+                        Order.builder().taxedPrice(new com.commercetools.api.models.cart.TaxedPriceImpl()) },
+                new Object[] { "taxedShippingPrice",
                         Order.builder().taxedShippingPrice(new com.commercetools.api.models.cart.TaxedPriceImpl()) },
-                new Object[] { Order.builder()
+                new Object[] { "discountOnTotalPrice", Order.builder()
                         .discountOnTotalPrice(new com.commercetools.api.models.cart.DiscountOnTotalPriceImpl()) },
-                new Object[] {
+                new Object[] { "taxMode",
                         Order.builder().taxMode(com.commercetools.api.models.cart.TaxMode.findEnum("Platform")) },
-                new Object[] { Order.builder()
-                        .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) },
-                new Object[] { Order.builder()
-                        .taxCalculationMode(
-                            com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) },
-                new Object[] { Order.builder()
-                        .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
-                new Object[] { Order.builder().billingAddress(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { Order.builder().shippingAddress(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { Order.builder()
-                        .shippingMode(com.commercetools.api.models.cart.ShippingMode.findEnum("Single")) },
-                new Object[] { Order.builder().shippingKey("shippingKey") },
-                new Object[] { Order.builder().shippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) },
-                new Object[] { Order.builder()
-                        .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
-                new Object[] { Order.builder()
-                        .shippingCustomFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { Order.builder()
+                new Object[] { "taxRoundingMode",
+                        Order.builder()
+                                .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) },
+                new Object[] { "taxCalculationMode",
+                        Order.builder()
+                                .taxCalculationMode(
+                                    com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) },
+                new Object[] { "inventoryMode",
+                        Order.builder()
+                                .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
+                new Object[] { "billingAddress",
+                        Order.builder().billingAddress(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "shippingAddress",
+                        Order.builder().shippingAddress(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "shippingMode",
+                        Order.builder()
+                                .shippingMode(com.commercetools.api.models.cart.ShippingMode.findEnum("Single")) },
+                new Object[] { "shippingKey", Order.builder().shippingKey("shippingKey") },
+                new Object[] { "shippingInfo",
+                        Order.builder().shippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) },
+                new Object[] { "shippingRateInput",
+                        Order.builder()
+                                .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
+                new Object[] { "shippingCustomFields",
+                        Order.builder()
+                                .shippingCustomFields(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "shipping", Order.builder()
                         .shipping(Collections.singletonList(new com.commercetools.api.models.cart.ShippingImpl())) },
-                new Object[] { Order.builder()
-                        .itemShippingAddresses(
-                            Collections.singletonList(new com.commercetools.api.models.common.AddressImpl())) },
-                new Object[] {
+                new Object[] { "itemShippingAddresses",
+                        Order.builder()
+                                .itemShippingAddresses(
+                                    Collections.singletonList(new com.commercetools.api.models.common.AddressImpl())) },
+                new Object[] { "discountCodes",
                         Order.builder()
                                 .discountCodes(Collections
                                         .singletonList(new com.commercetools.api.models.cart.DiscountCodeInfoImpl())) },
-                new Object[] {
+                new Object[] { "directDiscounts",
                         Order.builder()
                                 .directDiscounts(Collections
                                         .singletonList(new com.commercetools.api.models.cart.DirectDiscountImpl())) },
-                new Object[] { Order.builder()
-                        .refusedGifts(Collections.singletonList(
-                            new com.commercetools.api.models.cart_discount.CartDiscountReferenceImpl())) },
-                new Object[] { Order.builder().paymentInfo(new com.commercetools.api.models.order.PaymentInfoImpl()) },
-                new Object[] { Order.builder().country("country") }, new Object[] { Order.builder().locale("locale") },
-                new Object[] {
+                new Object[] { "refusedGifts",
+                        Order.builder()
+                                .refusedGifts(Collections.singletonList(
+                                    new com.commercetools.api.models.cart_discount.CartDiscountReferenceImpl())) },
+                new Object[] { "paymentInfo",
+                        Order.builder().paymentInfo(new com.commercetools.api.models.order.PaymentInfoImpl()) },
+                new Object[] { "country", Order.builder().country("country") },
+                new Object[] { "locale", Order.builder().locale("locale") },
+                new Object[] { "origin",
                         Order.builder().origin(com.commercetools.api.models.cart.CartOrigin.findEnum("Customer")) },
-                new Object[] { Order.builder().cart(new com.commercetools.api.models.cart.CartReferenceImpl()) },
-                new Object[] { Order.builder().quote(new com.commercetools.api.models.quote.QuoteReferenceImpl()) },
-                new Object[] {
+                new Object[] { "cart",
+                        Order.builder().cart(new com.commercetools.api.models.cart.CartReferenceImpl()) },
+                new Object[] { "quote",
+                        Order.builder().quote(new com.commercetools.api.models.quote.QuoteReferenceImpl()) },
+                new Object[] { "orderState",
                         Order.builder().orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) },
-                new Object[] { Order.builder()
-                        .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) },
-                new Object[] { Order.builder()
-                        .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) },
-                new Object[] { Order.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { Order.builder()
+                new Object[] { "shipmentState",
+                        Order.builder()
+                                .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) },
+                new Object[] { "paymentState",
+                        Order.builder()
+                                .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) },
+                new Object[] { "state",
+                        Order.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "syncInfo", Order.builder()
                         .syncInfo(Collections.singletonList(new com.commercetools.api.models.order.SyncInfoImpl())) },
-                new Object[] {
+                new Object[] { "returnInfo",
                         Order.builder()
                                 .returnInfo(Collections
                                         .singletonList(new com.commercetools.api.models.order.ReturnInfoImpl())) },
-                new Object[] { Order.builder()
+                new Object[] { "discountTypeCombination", Order.builder()
                         .discountTypeCombination(new com.commercetools.api.models.cart.DiscountTypeCombinationImpl()) },
-                new Object[] { Order.builder().lastMessageSequenceNumber(8L) },
-                new Object[] { Order.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { Order.builder().completedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Order.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Order.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+                new Object[] { "lastMessageSequenceNumber", Order.builder().lastMessageSequenceNumber(8L) },
+                new Object[] { "custom",
+                        Order.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "completedAt", Order.builder().completedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "createdAt", Order.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Order.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
                         Order.builder().lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Order.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) } };
+                new Object[] { "createdBy",
+                        Order.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTransitionCustomLineItemStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTransitionCustomLineItemStateActionTest.java
index afe6d31a9e8..4c3f54bd2f9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTransitionCustomLineItemStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTransitionCustomLineItemStateActionTest.java
@@ -3,41 +3,35 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderTransitionCustomLineItemStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderTransitionCustomLineItemStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderTransitionCustomLineItemStateActionBuilder builder) {
         OrderTransitionCustomLineItemStateAction orderTransitionCustomLineItemStateAction = builder.buildUnchecked();
         Assertions.assertThat(orderTransitionCustomLineItemStateAction)
                 .isInstanceOf(OrderTransitionCustomLineItemStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         OrderTransitionCustomLineItemStateAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemKey",
                         OrderTransitionCustomLineItemStateAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { OrderTransitionCustomLineItemStateAction.builder().quantity(8L) },
-                new Object[] { OrderTransitionCustomLineItemStateAction.builder()
-                        .fromState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { OrderTransitionCustomLineItemStateAction.builder()
-                        .toState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { OrderTransitionCustomLineItemStateAction.builder()
+                new Object[] { "quantity", OrderTransitionCustomLineItemStateAction.builder().quantity(8L) },
+                new Object[] { "fromState",
+                        OrderTransitionCustomLineItemStateAction.builder()
+                                .fromState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "toState",
+                        OrderTransitionCustomLineItemStateAction.builder()
+                                .toState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "actualTransitionDate", OrderTransitionCustomLineItemStateAction.builder()
                         .actualTransitionDate(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTransitionLineItemStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTransitionLineItemStateActionTest.java
index 3500baf548d..8ce4f56be17 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTransitionLineItemStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTransitionLineItemStateActionTest.java
@@ -3,38 +3,33 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderTransitionLineItemStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderTransitionLineItemStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderTransitionLineItemStateActionBuilder builder) {
         OrderTransitionLineItemStateAction orderTransitionLineItemStateAction = builder.buildUnchecked();
         Assertions.assertThat(orderTransitionLineItemStateAction)
                 .isInstanceOf(OrderTransitionLineItemStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderTransitionLineItemStateAction.builder().lineItemId("lineItemId") },
-                new Object[] { OrderTransitionLineItemStateAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { OrderTransitionLineItemStateAction.builder().quantity(8L) },
-                new Object[] { OrderTransitionLineItemStateAction.builder()
-                        .fromState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { OrderTransitionLineItemStateAction.builder()
-                        .toState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { OrderTransitionLineItemStateAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", OrderTransitionLineItemStateAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", OrderTransitionLineItemStateAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "quantity", OrderTransitionLineItemStateAction.builder().quantity(8L) },
+                new Object[] { "fromState",
+                        OrderTransitionLineItemStateAction.builder()
+                                .fromState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "toState",
+                        OrderTransitionLineItemStateAction.builder()
+                                .toState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "actualTransitionDate", OrderTransitionLineItemStateAction.builder()
                         .actualTransitionDate(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTransitionStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTransitionStateActionTest.java
index aed27b39a32..77d210729d9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTransitionStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderTransitionStateActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderTransitionStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderTransitionStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderTransitionStateActionBuilder builder) {
         OrderTransitionStateAction orderTransitionStateAction = builder.buildUnchecked();
         Assertions.assertThat(orderTransitionStateAction).isInstanceOf(OrderTransitionStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderTransitionStateAction.builder()
-                        .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { OrderTransitionStateAction.builder().force(true) } };
+                new Object[] { "state",
+                        OrderTransitionStateAction.builder()
+                                .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "force", OrderTransitionStateAction.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderUpdateItemShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderUpdateItemShippingAddressActionTest.java
index 3bbcb36ea92..d6cc88d5834 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderUpdateItemShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderUpdateItemShippingAddressActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderUpdateItemShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderUpdateItemShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderUpdateItemShippingAddressActionBuilder builder) {
         OrderUpdateItemShippingAddressAction orderUpdateItemShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(orderUpdateItemShippingAddressAction)
                 .isInstanceOf(OrderUpdateItemShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderUpdateItemShippingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", OrderUpdateItemShippingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderUpdateSyncInfoActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderUpdateSyncInfoActionTest.java
index f57781a3c7a..257ba608bff 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderUpdateSyncInfoActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderUpdateSyncInfoActionTest.java
@@ -3,33 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderUpdateSyncInfoActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderUpdateSyncInfoActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderUpdateSyncInfoActionBuilder builder) {
         OrderUpdateSyncInfoAction orderUpdateSyncInfoAction = builder.buildUnchecked();
         Assertions.assertThat(orderUpdateSyncInfoAction).isInstanceOf(OrderUpdateSyncInfoAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderUpdateSyncInfoAction.builder().externalId("externalId") },
-                new Object[] { OrderUpdateSyncInfoAction.builder()
-                        .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] {
+        return new Object[][] {
+                new Object[] { "externalId", OrderUpdateSyncInfoAction.builder().externalId("externalId") },
+                new Object[] { "channel",
+                        OrderUpdateSyncInfoAction.builder()
+                                .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "syncedAt",
                         OrderUpdateSyncInfoAction.builder().syncedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderUpdateTest.java
index 2d69fbb3eb8..f3f69d0562e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/OrderUpdateTest.java
@@ -3,31 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderUpdateBuilder builder) {
         OrderUpdate orderUpdate = builder.buildUnchecked();
         Assertions.assertThat(orderUpdate).isInstanceOf(OrderUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderUpdate.builder().version(2L) }, new Object[] { OrderUpdate.builder()
-                .actions(Collections.singletonList(new com.commercetools.api.models.order.OrderUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", OrderUpdate.builder().version(2L) }, new Object[] { "actions",
+                OrderUpdate.builder()
+                        .actions(Collections
+                                .singletonList(new com.commercetools.api.models.order.OrderUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ParcelDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ParcelDraftTest.java
index 69af447b536..74126bbc999 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ParcelDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ParcelDraftTest.java
@@ -3,37 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelDraftBuilder builder) {
         ParcelDraft parcelDraft = builder.buildUnchecked();
         Assertions.assertThat(parcelDraft).isInstanceOf(ParcelDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelDraft.builder().key("key") },
-                new Object[] { ParcelDraft.builder()
-                        .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", ParcelDraft.builder().key("key") },
+                new Object[] { "measurements",
+                        ParcelDraft.builder()
+                                .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) },
+                new Object[] { "trackingData",
                         ParcelDraft.builder().trackingData(new com.commercetools.api.models.order.TrackingDataImpl()) },
-                new Object[] { ParcelDraft.builder()
-                        .items(Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] {
+                new Object[] { "items",
+                        ParcelDraft.builder()
+                                .items(Collections
+                                        .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
+                new Object[] { "custom",
                         ParcelDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ParcelMeasurementsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ParcelMeasurementsTest.java
index 1af8ed106a7..a6d78912fca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ParcelMeasurementsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ParcelMeasurementsTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelMeasurementsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelMeasurementsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelMeasurementsBuilder builder) {
         ParcelMeasurements parcelMeasurements = builder.buildUnchecked();
         Assertions.assertThat(parcelMeasurements).isInstanceOf(ParcelMeasurements.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelMeasurements.builder().heightInMillimeter(5) },
-                new Object[] { ParcelMeasurements.builder().lengthInMillimeter(4) },
-                new Object[] { ParcelMeasurements.builder().widthInMillimeter(2) },
-                new Object[] { ParcelMeasurements.builder().weightInGram(9) } };
+        return new Object[][] {
+                new Object[] { "heightInMillimeter", ParcelMeasurements.builder().heightInMillimeter(5) },
+                new Object[] { "lengthInMillimeter", ParcelMeasurements.builder().lengthInMillimeter(4) },
+                new Object[] { "widthInMillimeter", ParcelMeasurements.builder().widthInMillimeter(2) },
+                new Object[] { "weightInGram", ParcelMeasurements.builder().weightInGram(9) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ParcelTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ParcelTest.java
index cc6cbddc9b7..34e87b3b77a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ParcelTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ParcelTest.java
@@ -4,39 +4,35 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelBuilder builder) {
         Parcel parcel = builder.buildUnchecked();
         Assertions.assertThat(parcel).isInstanceOf(Parcel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Parcel.builder().id("id") },
-                new Object[] { Parcel.builder().key("key") },
-                new Object[] { Parcel.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Parcel.builder()
-                        .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Parcel.builder().id("id") },
+                new Object[] { "key", Parcel.builder().key("key") },
+                new Object[] { "createdAt", Parcel.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "measurements",
+                        Parcel.builder()
+                                .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) },
+                new Object[] { "trackingData",
                         Parcel.builder().trackingData(new com.commercetools.api.models.order.TrackingDataImpl()) },
-                new Object[] { Parcel.builder()
-                        .items(Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] { Parcel.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
+                new Object[] { "items",
+                        Parcel.builder()
+                                .items(Collections
+                                        .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
+                new Object[] { "custom",
+                        Parcel.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/PaymentInfoTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/PaymentInfoTest.java
index f70158dc00f..25f9aa51af0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/PaymentInfoTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/PaymentInfoTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentInfoBuilder builder) {
         PaymentInfo paymentInfo = builder.buildUnchecked();
         Assertions.assertThat(paymentInfo).isInstanceOf(PaymentInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentInfo.builder()
+        return new Object[][] { new Object[] { "payments", PaymentInfo.builder()
                 .payments(
                     Collections.singletonList(new com.commercetools.api.models.payment.PaymentReferenceImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ProductVariantImportDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ProductVariantImportDraftTest.java
index 649647e0300..0dee511b11f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ProductVariantImportDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ProductVariantImportDraftTest.java
@@ -3,38 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantImportDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantImportDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantImportDraftBuilder builder) {
         ProductVariantImportDraft productVariantImportDraft = builder.buildUnchecked();
         Assertions.assertThat(productVariantImportDraft).isInstanceOf(ProductVariantImportDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantImportDraft.builder().id(2L) },
-                new Object[] { ProductVariantImportDraft.builder().sku("sku") },
-                new Object[] { ProductVariantImportDraft.builder()
-                        .prices(Collections.singletonList(new com.commercetools.api.models.common.PriceDraftImpl())) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", ProductVariantImportDraft.builder().id(2L) },
+                new Object[] { "sku", ProductVariantImportDraft.builder().sku("sku") },
+                new Object[] { "prices",
+                        ProductVariantImportDraft.builder()
+                                .prices(Collections
+                                        .singletonList(new com.commercetools.api.models.common.PriceDraftImpl())) },
+                new Object[] { "attributes",
                         ProductVariantImportDraft.builder()
                                 .attributes(Collections
                                         .singletonList(new com.commercetools.api.models.product.AttributeImpl())) },
-                new Object[] { ProductVariantImportDraft.builder()
+                new Object[] { "images", ProductVariantImportDraft.builder()
                         .images(Collections.singletonList(new com.commercetools.api.models.common.ImageImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ReturnInfoDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ReturnInfoDraftTest.java
index 11747f478ef..ae4c01cb049 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ReturnInfoDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ReturnInfoDraftTest.java
@@ -4,36 +4,29 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReturnInfoDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReturnInfoDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReturnInfoDraftBuilder builder) {
         ReturnInfoDraft returnInfoDraft = builder.buildUnchecked();
         Assertions.assertThat(returnInfoDraft).isInstanceOf(ReturnInfoDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "items",
                         ReturnInfoDraft.builder()
                                 .items(Collections
                                         .singletonList(new com.commercetools.api.models.order.ReturnItemDraftImpl())) },
-                new Object[] { ReturnInfoDraft.builder().returnTrackingId("returnTrackingId") },
-                new Object[] { ReturnInfoDraft.builder().returnDate(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "returnTrackingId", ReturnInfoDraft.builder().returnTrackingId("returnTrackingId") },
+                new Object[] { "returnDate",
+                        ReturnInfoDraft.builder().returnDate(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ReturnInfoTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ReturnInfoTest.java
index 356e2c55e9e..22f20f77fc9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ReturnInfoTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ReturnInfoTest.java
@@ -4,34 +4,29 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReturnInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReturnInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReturnInfoBuilder builder) {
         ReturnInfo returnInfo = builder.buildUnchecked();
         Assertions.assertThat(returnInfo).isInstanceOf(ReturnInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ReturnInfo.builder()
-                        .items(Collections.singletonList(new com.commercetools.api.models.order.ReturnItemImpl())) },
-                new Object[] { ReturnInfo.builder().returnTrackingId("returnTrackingId") },
-                new Object[] { ReturnInfo.builder().returnDate(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "items",
+                        ReturnInfo.builder()
+                                .items(Collections
+                                        .singletonList(new com.commercetools.api.models.order.ReturnItemImpl())) },
+                new Object[] { "returnTrackingId", ReturnInfo.builder().returnTrackingId("returnTrackingId") },
+                new Object[] { "returnDate",
+                        ReturnInfo.builder().returnDate(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ReturnItemDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ReturnItemDraftTest.java
index 3f4a4c1332f..093a6e6dac6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ReturnItemDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ReturnItemDraftTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReturnItemDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReturnItemDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReturnItemDraftBuilder builder) {
         ReturnItemDraft returnItemDraft = builder.buildUnchecked();
         Assertions.assertThat(returnItemDraft).isInstanceOf(ReturnItemDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReturnItemDraft.builder().key("key") },
-                new Object[] { ReturnItemDraft.builder().quantity(8L) },
-                new Object[] { ReturnItemDraft.builder().lineItemId("lineItemId") },
-                new Object[] { ReturnItemDraft.builder().customLineItemId("customLineItemId") },
-                new Object[] { ReturnItemDraft.builder().comment("comment") },
-                new Object[] { ReturnItemDraft.builder()
+        return new Object[][] { new Object[] { "key", ReturnItemDraft.builder().key("key") },
+                new Object[] { "quantity", ReturnItemDraft.builder().quantity(8L) },
+                new Object[] { "lineItemId", ReturnItemDraft.builder().lineItemId("lineItemId") },
+                new Object[] { "customLineItemId", ReturnItemDraft.builder().customLineItemId("customLineItemId") },
+                new Object[] { "comment", ReturnItemDraft.builder().comment("comment") },
+                new Object[] { "shipmentState", ReturnItemDraft.builder()
                         .shipmentState(com.commercetools.api.models.order.ReturnShipmentState.findEnum("Advised")) },
-                new Object[] { ReturnItemDraft.builder()
+                new Object[] { "custom", ReturnItemDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ShippingInfoImportDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ShippingInfoImportDraftTest.java
index d191e994184..fbc15f2bef3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ShippingInfoImportDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/ShippingInfoImportDraftTest.java
@@ -3,50 +3,44 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingInfoImportDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingInfoImportDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingInfoImportDraftBuilder builder) {
         ShippingInfoImportDraft shippingInfoImportDraft = builder.buildUnchecked();
         Assertions.assertThat(shippingInfoImportDraft).isInstanceOf(ShippingInfoImportDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShippingInfoImportDraft.builder().shippingMethodName("shippingMethodName") },
-                new Object[] {
+                new Object[] { "shippingMethodName",
+                        ShippingInfoImportDraft.builder().shippingMethodName("shippingMethodName") },
+                new Object[] { "price",
                         ShippingInfoImportDraft.builder().price(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { ShippingInfoImportDraft.builder()
+                new Object[] { "shippingRate", ShippingInfoImportDraft.builder()
                         .shippingRate(new com.commercetools.api.models.shipping_method.ShippingRateDraftImpl()) },
-                new Object[] { ShippingInfoImportDraft.builder()
-                        .taxRate(new com.commercetools.api.models.tax_category.TaxRateImpl()) },
-                new Object[] { ShippingInfoImportDraft.builder()
+                new Object[] { "taxRate",
+                        ShippingInfoImportDraft.builder()
+                                .taxRate(new com.commercetools.api.models.tax_category.TaxRateImpl()) },
+                new Object[] { "taxCategory", ShippingInfoImportDraft.builder()
                         .taxCategory(
                             new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) },
-                new Object[] { ShippingInfoImportDraft.builder()
+                new Object[] { "shippingMethod", ShippingInfoImportDraft.builder()
                         .shippingMethod(
                             new com.commercetools.api.models.shipping_method.ShippingMethodResourceIdentifierImpl()) },
-                new Object[] {
+                new Object[] { "deliveries",
                         ShippingInfoImportDraft.builder()
                                 .deliveries(Collections
                                         .singletonList(new com.commercetools.api.models.order.DeliveryDraftImpl())) },
-                new Object[] { ShippingInfoImportDraft.builder()
+                new Object[] { "discountedPrice", ShippingInfoImportDraft.builder()
                         .discountedPrice(new com.commercetools.api.models.order.DiscountedLineItemPriceDraftImpl()) },
-                new Object[] { ShippingInfoImportDraft.builder()
+                new Object[] { "shippingMethodState", ShippingInfoImportDraft.builder()
                         .shippingMethodState(
                             com.commercetools.api.models.cart.ShippingMethodState.findEnum("DoesNotMatchCart")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/SyncInfoTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/SyncInfoTest.java
index d3b8f385ed0..8636c34d167 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/SyncInfoTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/SyncInfoTest.java
@@ -3,34 +3,26 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SyncInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SyncInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SyncInfoBuilder builder) {
         SyncInfo syncInfo = builder.buildUnchecked();
         Assertions.assertThat(syncInfo).isInstanceOf(SyncInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "channel",
                         SyncInfo.builder().channel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
-                new Object[] { SyncInfo.builder().externalId("externalId") },
-                new Object[] { SyncInfo.builder().syncedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "externalId", SyncInfo.builder().externalId("externalId") },
+                new Object[] { "syncedAt", SyncInfo.builder().syncedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/TaxedItemPriceDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/TaxedItemPriceDraftTest.java
index c51546fae16..5c730a0d62a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/TaxedItemPriceDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/TaxedItemPriceDraftTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxedItemPriceDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxedItemPriceDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxedItemPriceDraftBuilder builder) {
         TaxedItemPriceDraft taxedItemPriceDraft = builder.buildUnchecked();
         Assertions.assertThat(taxedItemPriceDraft).isInstanceOf(TaxedItemPriceDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "totalNet",
                         TaxedItemPriceDraft.builder().totalNet(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { TaxedItemPriceDraft.builder()
+                new Object[] { "totalGross", TaxedItemPriceDraft.builder()
                         .totalGross(new com.commercetools.api.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/TrackingDataTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/TrackingDataTest.java
index 5be75bfc258..bb3dbe79a46 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/TrackingDataTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order/TrackingDataTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.order;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TrackingDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TrackingDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TrackingDataBuilder builder) {
         TrackingData trackingData = builder.buildUnchecked();
         Assertions.assertThat(trackingData).isInstanceOf(TrackingData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TrackingData.builder().trackingId("trackingId") },
-                new Object[] { TrackingData.builder().carrier("carrier") },
-                new Object[] { TrackingData.builder().provider("provider") },
-                new Object[] { TrackingData.builder().providerTransaction("providerTransaction") },
-                new Object[] { TrackingData.builder().isReturn(true) } };
+        return new Object[][] { new Object[] { "trackingId", TrackingData.builder().trackingId("trackingId") },
+                new Object[] { "carrier", TrackingData.builder().carrier("carrier") },
+                new Object[] { "provider", TrackingData.builder().provider("provider") },
+                new Object[] { "providerTransaction",
+                        TrackingData.builder().providerTransaction("providerTransaction") },
+                new Object[] { "isReturn", TrackingData.builder().isReturn(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditAddStagedActionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditAddStagedActionActionTest.java
index 3d8f3a89578..5c907d141dd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditAddStagedActionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditAddStagedActionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditAddStagedActionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditAddStagedActionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditAddStagedActionActionBuilder builder) {
         OrderEditAddStagedActionAction orderEditAddStagedActionAction = builder.buildUnchecked();
         Assertions.assertThat(orderEditAddStagedActionAction).isInstanceOf(OrderEditAddStagedActionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderEditAddStagedActionAction.builder()
+        return new Object[][] { new Object[] { "stagedAction", OrderEditAddStagedActionAction.builder()
                 .stagedAction(new com.commercetools.api.models.order.StagedOrderUpdateActionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditAppliedTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditAppliedTest.java
index 3fb0f9882bf..67989ca191d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditAppliedTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditAppliedTest.java
@@ -3,34 +3,28 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditAppliedTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditAppliedBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditAppliedBuilder builder) {
         OrderEditApplied orderEditApplied = builder.buildUnchecked();
         Assertions.assertThat(orderEditApplied).isInstanceOf(OrderEditApplied.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderEditApplied.builder().appliedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { OrderEditApplied.builder()
-                        .excerptBeforeEdit(new com.commercetools.api.models.order_edit.OrderExcerptImpl()) },
-                new Object[] { OrderEditApplied.builder()
+                new Object[] { "appliedAt",
+                        OrderEditApplied.builder().appliedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "excerptBeforeEdit",
+                        OrderEditApplied.builder()
+                                .excerptBeforeEdit(new com.commercetools.api.models.order_edit.OrderExcerptImpl()) },
+                new Object[] { "excerptAfterEdit", OrderEditApplied.builder()
                         .excerptAfterEdit(new com.commercetools.api.models.order_edit.OrderExcerptImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditApplyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditApplyTest.java
index 1515279c345..472406cab36 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditApplyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditApplyTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditApplyTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditApplyBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditApplyBuilder builder) {
         OrderEditApply orderEditApply = builder.buildUnchecked();
         Assertions.assertThat(orderEditApply).isInstanceOf(OrderEditApply.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderEditApply.builder().editVersion(7L) },
-                new Object[] { OrderEditApply.builder().resourceVersion(9L) } };
+        return new Object[][] { new Object[] { "editVersion", OrderEditApply.builder().editVersion(7L) },
+                new Object[] { "resourceVersion", OrderEditApply.builder().resourceVersion(9L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditDraftTest.java
index a666ee43215..9406bb19b78 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditDraftTest.java
@@ -3,39 +3,34 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditDraftBuilder builder) {
         OrderEditDraft orderEditDraft = builder.buildUnchecked();
         Assertions.assertThat(orderEditDraft).isInstanceOf(OrderEditDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderEditDraft.builder().key("key") },
-                new Object[] { OrderEditDraft.builder()
-                        .resource(new com.commercetools.api.models.order.OrderReferenceImpl()) },
-                new Object[] { OrderEditDraft.builder()
-                        .stagedActions(Collections
-                                .singletonList(new com.commercetools.api.models.order.StagedOrderUpdateActionImpl())) },
-                new Object[] { OrderEditDraft.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { OrderEditDraft.builder().comment("comment") },
-                new Object[] { OrderEditDraft.builder().dryRun(true) } };
+        return new Object[][] { new Object[] { "key", OrderEditDraft.builder().key("key") },
+                new Object[] { "resource",
+                        OrderEditDraft.builder()
+                                .resource(new com.commercetools.api.models.order.OrderReferenceImpl()) },
+                new Object[] { "stagedActions",
+                        OrderEditDraft.builder()
+                                .stagedActions(Collections.singletonList(
+                                    new com.commercetools.api.models.order.StagedOrderUpdateActionImpl())) },
+                new Object[] { "custom",
+                        OrderEditDraft.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "comment", OrderEditDraft.builder().comment("comment") },
+                new Object[] { "dryRun", OrderEditDraft.builder().dryRun(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditNotProcessedTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditNotProcessedTest.java
index e2ae87bb7dc..92e09b49f6a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditNotProcessedTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditNotProcessedTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditNotProcessedTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditPagedQueryResponseTest.java
index 56dc398619b..9c2d3982efb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditPagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditPagedQueryResponseBuilder builder) {
         OrderEditPagedQueryResponse orderEditPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(orderEditPagedQueryResponse).isInstanceOf(OrderEditPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderEditPagedQueryResponse.builder().limit(7L) },
-                new Object[] { OrderEditPagedQueryResponse.builder().offset(3L) },
-                new Object[] { OrderEditPagedQueryResponse.builder().count(2L) },
-                new Object[] { OrderEditPagedQueryResponse.builder().total(1L) },
-                new Object[] { OrderEditPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", OrderEditPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", OrderEditPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", OrderEditPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", OrderEditPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", OrderEditPagedQueryResponse.builder()
                         .results(
                             Collections.singletonList(new com.commercetools.api.models.order_edit.OrderEditImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditPreviewFailureTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditPreviewFailureTest.java
index a43bdcc35c4..f156933b716 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditPreviewFailureTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditPreviewFailureTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditPreviewFailureTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditPreviewFailureBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditPreviewFailureBuilder builder) {
         OrderEditPreviewFailure orderEditPreviewFailure = builder.buildUnchecked();
         Assertions.assertThat(orderEditPreviewFailure).isInstanceOf(OrderEditPreviewFailure.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderEditPreviewFailure.builder()
+        return new Object[][] { new Object[] { "errors", OrderEditPreviewFailure.builder()
                 .errors(Collections.singletonList(new com.commercetools.api.models.error.ErrorObjectImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditPreviewSuccessTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditPreviewSuccessTest.java
index cd1a3cd40d9..882d43dfd63 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditPreviewSuccessTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditPreviewSuccessTest.java
@@ -3,35 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditPreviewSuccessTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditPreviewSuccessBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditPreviewSuccessBuilder builder) {
         OrderEditPreviewSuccess orderEditPreviewSuccess = builder.buildUnchecked();
         Assertions.assertThat(orderEditPreviewSuccess).isInstanceOf(OrderEditPreviewSuccess.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderEditPreviewSuccess.builder()
-                        .preview(new com.commercetools.api.models.order_edit.StagedOrderImpl()) },
-                new Object[] { OrderEditPreviewSuccess.builder()
-                        .messagePayloads(Collections
-                                .singletonList(new com.commercetools.api.models.message.MessagePayloadImpl())) } };
+                new Object[] { "preview",
+                        OrderEditPreviewSuccess.builder()
+                                .preview(new com.commercetools.api.models.order_edit.StagedOrderImpl()) },
+                new Object[] { "messagePayloads",
+                        OrderEditPreviewSuccess.builder()
+                                .messagePayloads(Collections.singletonList(
+                                    new com.commercetools.api.models.message.MessagePayloadImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditReferenceTest.java
index b705b285e89..80a4325b66a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditReferenceTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditReferenceBuilder builder) {
         OrderEditReference orderEditReference = builder.buildUnchecked();
         Assertions.assertThat(orderEditReference).isInstanceOf(OrderEditReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "obj",
                         OrderEditReference.builder().obj(new com.commercetools.api.models.order_edit.OrderEditImpl()) },
-                new Object[] { OrderEditReference.builder().id("id") } };
+                new Object[] { "id", OrderEditReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditResourceIdentifierTest.java
index f5ae713660a..ab3213c7717 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditResourceIdentifierBuilder builder) {
         OrderEditResourceIdentifier orderEditResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(orderEditResourceIdentifier).isInstanceOf(OrderEditResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderEditResourceIdentifier.builder().id("id") },
-                new Object[] { OrderEditResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", OrderEditResourceIdentifier.builder().id("id") },
+                new Object[] { "key", OrderEditResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetCommentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetCommentActionTest.java
index 9548d5277ab..b5aa8df664b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetCommentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetCommentActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditSetCommentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditSetCommentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditSetCommentActionBuilder builder) {
         OrderEditSetCommentAction orderEditSetCommentAction = builder.buildUnchecked();
         Assertions.assertThat(orderEditSetCommentAction).isInstanceOf(OrderEditSetCommentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderEditSetCommentAction.builder().comment("comment") } };
+        return new Object[][] { new Object[] { "comment", OrderEditSetCommentAction.builder().comment("comment") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetCustomFieldActionTest.java
index 84a7847f2fe..b7dc060ed23 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditSetCustomFieldActionBuilder builder) {
         OrderEditSetCustomFieldAction orderEditSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(orderEditSetCustomFieldAction).isInstanceOf(OrderEditSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderEditSetCustomFieldAction.builder().name("name") },
-                new Object[] { OrderEditSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", OrderEditSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", OrderEditSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetCustomTypeActionTest.java
index 78735c9c30b..e38bc96e39d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditSetCustomTypeActionBuilder builder) {
         OrderEditSetCustomTypeAction orderEditSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(orderEditSetCustomTypeAction).isInstanceOf(OrderEditSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderEditSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { OrderEditSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        OrderEditSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", OrderEditSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetKeyActionTest.java
index 5315c71ded8..26c9cde0a44 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditSetKeyActionBuilder builder) {
         OrderEditSetKeyAction orderEditSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(orderEditSetKeyAction).isInstanceOf(OrderEditSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderEditSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", OrderEditSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetStagedActionsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetStagedActionsActionTest.java
index 2c8ae531d98..6bd281085d9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetStagedActionsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditSetStagedActionsActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditSetStagedActionsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditSetStagedActionsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditSetStagedActionsActionBuilder builder) {
         OrderEditSetStagedActionsAction orderEditSetStagedActionsAction = builder.buildUnchecked();
         Assertions.assertThat(orderEditSetStagedActionsAction).isInstanceOf(OrderEditSetStagedActionsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderEditSetStagedActionsAction.builder()
-                .stagedActions(Collections
-                        .singletonList(new com.commercetools.api.models.order.StagedOrderUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "stagedActions",
+                OrderEditSetStagedActionsAction.builder()
+                        .stagedActions(Collections.singletonList(
+                            new com.commercetools.api.models.order.StagedOrderUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditTest.java
index 9f1a3f072c0..469f4b868ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditTest.java
@@ -4,45 +4,42 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditBuilder builder) {
         OrderEdit orderEdit = builder.buildUnchecked();
         Assertions.assertThat(orderEdit).isInstanceOf(OrderEdit.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderEdit.builder().id("id") },
-                new Object[] { OrderEdit.builder().version(2L) }, new Object[] { OrderEdit.builder().key("key") },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", OrderEdit.builder().id("id") },
+                new Object[] { "version", OrderEdit.builder().version(2L) },
+                new Object[] { "key", OrderEdit.builder().key("key") },
+                new Object[] { "resource",
                         OrderEdit.builder().resource(new com.commercetools.api.models.order.OrderReferenceImpl()) },
-                new Object[] { OrderEdit.builder()
-                        .stagedActions(Collections
-                                .singletonList(new com.commercetools.api.models.order.StagedOrderUpdateActionImpl())) },
-                new Object[] {
+                new Object[] { "stagedActions",
+                        OrderEdit.builder()
+                                .stagedActions(Collections.singletonList(
+                                    new com.commercetools.api.models.order.StagedOrderUpdateActionImpl())) },
+                new Object[] { "result",
                         OrderEdit.builder().result(new com.commercetools.api.models.order_edit.OrderEditResultImpl()) },
-                new Object[] { OrderEdit.builder().comment("comment") },
-                new Object[] { OrderEdit.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { OrderEdit.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { OrderEdit.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { OrderEdit.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+                new Object[] { "comment", OrderEdit.builder().comment("comment") },
+                new Object[] { "custom",
+                        OrderEdit.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "createdAt", OrderEdit.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        OrderEdit.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        OrderEdit.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         OrderEdit.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditUpdateTest.java
index e11a55559ca..7c7def6cfc6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderEditUpdateTest.java
@@ -3,34 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderEditUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderEditUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderEditUpdateBuilder builder) {
         OrderEditUpdate orderEditUpdate = builder.buildUnchecked();
         Assertions.assertThat(orderEditUpdate).isInstanceOf(OrderEditUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderEditUpdate.builder().version(2L) },
-                new Object[] { OrderEditUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.order_edit.OrderEditUpdateActionImpl())) },
-                new Object[] { OrderEditUpdate.builder().dryRun(true) } };
+        return new Object[][] { new Object[] { "version", OrderEditUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        OrderEditUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.order_edit.OrderEditUpdateActionImpl())) },
+                new Object[] { "dryRun", OrderEditUpdate.builder().dryRun(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderExcerptTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderExcerptTest.java
index ed0b8e875f8..69e99d8454c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderExcerptTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/OrderExcerptTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderExcerptTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderExcerptBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderExcerptBuilder builder) {
         OrderExcerpt orderExcerpt = builder.buildUnchecked();
         Assertions.assertThat(orderExcerpt).isInstanceOf(OrderExcerpt.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "totalPrice",
                         OrderExcerpt.builder().totalPrice(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] {
+                new Object[] { "taxedPrice",
                         OrderExcerpt.builder().taxedPrice(new com.commercetools.api.models.cart.TaxedPriceImpl()) },
-                new Object[] { OrderExcerpt.builder().version(2L) } };
+                new Object[] { "version", OrderExcerpt.builder().version(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddCustomLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddCustomLineItemActionTest.java
index 4d74733a119..54adf3d6475 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddCustomLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddCustomLineItemActionTest.java
@@ -1,48 +1,43 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderAddCustomLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderAddCustomLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderAddCustomLineItemActionBuilder builder) {
         StagedOrderAddCustomLineItemAction stagedOrderAddCustomLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderAddCustomLineItemAction)
                 .isInstanceOf(StagedOrderAddCustomLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderAddCustomLineItemAction.builder()
-                        .money(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { StagedOrderAddCustomLineItemAction.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { StagedOrderAddCustomLineItemAction.builder().key("key") },
-                new Object[] { StagedOrderAddCustomLineItemAction.builder().quantity(8L) },
-                new Object[] { StagedOrderAddCustomLineItemAction.builder().slug("slug") },
-                new Object[] { StagedOrderAddCustomLineItemAction.builder()
+                new Object[] { "money",
+                        StagedOrderAddCustomLineItemAction.builder()
+                                .money(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "name",
+                        StagedOrderAddCustomLineItemAction.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "key", StagedOrderAddCustomLineItemAction.builder().key("key") },
+                new Object[] { "quantity", StagedOrderAddCustomLineItemAction.builder().quantity(8L) },
+                new Object[] { "slug", StagedOrderAddCustomLineItemAction.builder().slug("slug") },
+                new Object[] { "taxCategory", StagedOrderAddCustomLineItemAction.builder()
                         .taxCategory(
                             new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) },
-                new Object[] { StagedOrderAddCustomLineItemAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { StagedOrderAddCustomLineItemAction.builder()
+                new Object[] { "externalTaxRate",
+                        StagedOrderAddCustomLineItemAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "shippingDetails", StagedOrderAddCustomLineItemAction.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) },
-                new Object[] { StagedOrderAddCustomLineItemAction.builder()
+                new Object[] { "priceMode", StagedOrderAddCustomLineItemAction.builder()
                         .priceMode(com.commercetools.api.models.cart.CustomLineItemPriceMode.findEnum("Standard")) },
-                new Object[] { StagedOrderAddCustomLineItemAction.builder()
+                new Object[] { "custom", StagedOrderAddCustomLineItemAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddDeliveryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddDeliveryActionTest.java
index 9324eb5f456..ad07d19933a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddDeliveryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddDeliveryActionTest.java
@@ -3,38 +3,36 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderAddDeliveryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderAddDeliveryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderAddDeliveryActionBuilder builder) {
         StagedOrderAddDeliveryAction stagedOrderAddDeliveryAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderAddDeliveryAction).isInstanceOf(StagedOrderAddDeliveryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderAddDeliveryAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { StagedOrderAddDeliveryAction.builder().shippingKey("shippingKey") },
-                new Object[] { StagedOrderAddDeliveryAction.builder()
-                        .items(Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] { StagedOrderAddDeliveryAction.builder()
-                        .address(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { StagedOrderAddDeliveryAction.builder()
-                        .parcels(Collections.singletonList(new com.commercetools.api.models.order.ParcelDraftImpl())) },
-                new Object[] { StagedOrderAddDeliveryAction.builder()
+        return new Object[][] {
+                new Object[] { "deliveryKey", StagedOrderAddDeliveryAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "shippingKey", StagedOrderAddDeliveryAction.builder().shippingKey("shippingKey") },
+                new Object[] { "items",
+                        StagedOrderAddDeliveryAction.builder()
+                                .items(Collections
+                                        .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
+                new Object[] { "address",
+                        StagedOrderAddDeliveryAction.builder()
+                                .address(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "parcels",
+                        StagedOrderAddDeliveryAction.builder()
+                                .parcels(Collections
+                                        .singletonList(new com.commercetools.api.models.order.ParcelDraftImpl())) },
+                new Object[] { "custom", StagedOrderAddDeliveryAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddDiscountCodeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddDiscountCodeActionTest.java
index 03a11e97aec..a7e17d88ef1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddDiscountCodeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddDiscountCodeActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderAddDiscountCodeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderAddDiscountCodeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderAddDiscountCodeActionBuilder builder) {
         StagedOrderAddDiscountCodeAction stagedOrderAddDiscountCodeAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderAddDiscountCodeAction).isInstanceOf(StagedOrderAddDiscountCodeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderAddDiscountCodeAction.builder().code("code") } };
+        return new Object[][] { new Object[] { "code", StagedOrderAddDiscountCodeAction.builder().code("code") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddItemShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddItemShippingAddressActionTest.java
index adc9c506c4e..60a051653df 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddItemShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddItemShippingAddressActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderAddItemShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderAddItemShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderAddItemShippingAddressActionBuilder builder) {
         StagedOrderAddItemShippingAddressAction stagedOrderAddItemShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderAddItemShippingAddressAction)
                 .isInstanceOf(StagedOrderAddItemShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderAddItemShippingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", StagedOrderAddItemShippingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddLineItemActionTest.java
index 3296dc10a19..4dd56245b77 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddLineItemActionTest.java
@@ -3,52 +3,48 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderAddLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderAddLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderAddLineItemActionBuilder builder) {
         StagedOrderAddLineItemAction stagedOrderAddLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderAddLineItemAction).isInstanceOf(StagedOrderAddLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderAddLineItemAction.builder().key("key") },
-                new Object[] { StagedOrderAddLineItemAction.builder().productId("productId") },
-                new Object[] { StagedOrderAddLineItemAction.builder().variantId(5L) },
-                new Object[] { StagedOrderAddLineItemAction.builder().sku("sku") },
-                new Object[] { StagedOrderAddLineItemAction.builder().quantity(8L) },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", StagedOrderAddLineItemAction.builder().key("key") },
+                new Object[] { "productId", StagedOrderAddLineItemAction.builder().productId("productId") },
+                new Object[] { "variantId", StagedOrderAddLineItemAction.builder().variantId(5L) },
+                new Object[] { "sku", StagedOrderAddLineItemAction.builder().sku("sku") },
+                new Object[] { "quantity", StagedOrderAddLineItemAction.builder().quantity(8L) },
+                new Object[] { "addedAt",
                         StagedOrderAddLineItemAction.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StagedOrderAddLineItemAction.builder()
-                        .distributionChannel(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { StagedOrderAddLineItemAction.builder()
+                new Object[] { "distributionChannel",
+                        StagedOrderAddLineItemAction.builder()
+                                .distributionChannel(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "supplyChannel", StagedOrderAddLineItemAction.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { StagedOrderAddLineItemAction.builder()
-                        .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { StagedOrderAddLineItemAction.builder()
+                new Object[] { "externalPrice",
+                        StagedOrderAddLineItemAction.builder()
+                                .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "externalTotalPrice", StagedOrderAddLineItemAction.builder()
                         .externalTotalPrice(new com.commercetools.api.models.cart.ExternalLineItemTotalPriceImpl()) },
-                new Object[] { StagedOrderAddLineItemAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { StagedOrderAddLineItemAction.builder()
-                        .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
-                new Object[] { StagedOrderAddLineItemAction.builder()
+                new Object[] { "externalTaxRate",
+                        StagedOrderAddLineItemAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "inventoryMode",
+                        StagedOrderAddLineItemAction.builder()
+                                .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
+                new Object[] { "shippingDetails", StagedOrderAddLineItemAction.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) },
-                new Object[] { StagedOrderAddLineItemAction.builder()
+                new Object[] { "custom", StagedOrderAddLineItemAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddParcelToDeliveryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddParcelToDeliveryActionTest.java
index 28a95cd0586..82ae95bfde7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddParcelToDeliveryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddParcelToDeliveryActionTest.java
@@ -3,41 +3,38 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderAddParcelToDeliveryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderAddParcelToDeliveryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderAddParcelToDeliveryActionBuilder builder) {
         StagedOrderAddParcelToDeliveryAction stagedOrderAddParcelToDeliveryAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderAddParcelToDeliveryAction)
                 .isInstanceOf(StagedOrderAddParcelToDeliveryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderAddParcelToDeliveryAction.builder().deliveryId("deliveryId") },
-                new Object[] { StagedOrderAddParcelToDeliveryAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { StagedOrderAddParcelToDeliveryAction.builder().parcelKey("parcelKey") },
-                new Object[] { StagedOrderAddParcelToDeliveryAction.builder()
-                        .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) },
-                new Object[] { StagedOrderAddParcelToDeliveryAction.builder()
-                        .trackingData(new com.commercetools.api.models.order.TrackingDataImpl()) },
-                new Object[] { StagedOrderAddParcelToDeliveryAction.builder()
-                        .items(Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
-                new Object[] { StagedOrderAddParcelToDeliveryAction.builder()
+                new Object[] { "deliveryId", StagedOrderAddParcelToDeliveryAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey",
+                        StagedOrderAddParcelToDeliveryAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "parcelKey", StagedOrderAddParcelToDeliveryAction.builder().parcelKey("parcelKey") },
+                new Object[] { "measurements",
+                        StagedOrderAddParcelToDeliveryAction.builder()
+                                .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) },
+                new Object[] { "trackingData",
+                        StagedOrderAddParcelToDeliveryAction.builder()
+                                .trackingData(new com.commercetools.api.models.order.TrackingDataImpl()) },
+                new Object[] { "items",
+                        StagedOrderAddParcelToDeliveryAction.builder()
+                                .items(Collections
+                                        .singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) },
+                new Object[] { "custom", StagedOrderAddParcelToDeliveryAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddPaymentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddPaymentActionTest.java
index 7dcbe2c32d9..51d125d2dc3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddPaymentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddPaymentActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderAddPaymentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderAddPaymentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderAddPaymentActionBuilder builder) {
         StagedOrderAddPaymentAction stagedOrderAddPaymentAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderAddPaymentAction).isInstanceOf(StagedOrderAddPaymentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderAddPaymentAction.builder()
+        return new Object[][] { new Object[] { "payment", StagedOrderAddPaymentAction.builder()
                 .payment(new com.commercetools.api.models.payment.PaymentResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddReturnInfoActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddReturnInfoActionTest.java
index 42d6eb7c4e0..4e0f6656b0b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddReturnInfoActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddReturnInfoActionTest.java
@@ -4,36 +4,29 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderAddReturnInfoActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderAddReturnInfoActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderAddReturnInfoActionBuilder builder) {
         StagedOrderAddReturnInfoAction stagedOrderAddReturnInfoAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderAddReturnInfoAction).isInstanceOf(StagedOrderAddReturnInfoAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderAddReturnInfoAction.builder().returnTrackingId("returnTrackingId") },
-                new Object[] {
+                new Object[] { "returnTrackingId",
+                        StagedOrderAddReturnInfoAction.builder().returnTrackingId("returnTrackingId") },
+                new Object[] { "items",
                         StagedOrderAddReturnInfoAction.builder()
                                 .items(Collections
                                         .singletonList(new com.commercetools.api.models.order.ReturnItemDraftImpl())) },
-                new Object[] { StagedOrderAddReturnInfoAction.builder()
+                new Object[] { "returnDate", StagedOrderAddReturnInfoAction.builder()
                         .returnDate(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddShoppingListActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddShoppingListActionTest.java
index 79b35257fd4..fc8ab0136b1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddShoppingListActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderAddShoppingListActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderAddShoppingListActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderAddShoppingListActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderAddShoppingListActionBuilder builder) {
         StagedOrderAddShoppingListAction stagedOrderAddShoppingListAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderAddShoppingListAction).isInstanceOf(StagedOrderAddShoppingListAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderAddShoppingListAction.builder()
+        return new Object[][] { new Object[] { "shoppingList", StagedOrderAddShoppingListAction.builder()
                 .shoppingList(new com.commercetools.api.models.shopping_list.ShoppingListResourceIdentifierImpl()) },
-                new Object[] { StagedOrderAddShoppingListAction.builder()
-                        .distributionChannel(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { StagedOrderAddShoppingListAction.builder()
+                new Object[] { "distributionChannel",
+                        StagedOrderAddShoppingListAction.builder()
+                                .distributionChannel(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "supplyChannel", StagedOrderAddShoppingListAction.builder()
                         .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeCustomLineItemMoneyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeCustomLineItemMoneyActionTest.java
index 305e544e005..40b87ee60e2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeCustomLineItemMoneyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeCustomLineItemMoneyActionTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderChangeCustomLineItemMoneyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderChangeCustomLineItemMoneyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderChangeCustomLineItemMoneyActionBuilder builder) {
         StagedOrderChangeCustomLineItemMoneyAction stagedOrderChangeCustomLineItemMoneyAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderChangeCustomLineItemMoneyAction)
                 .isInstanceOf(StagedOrderChangeCustomLineItemMoneyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         StagedOrderChangeCustomLineItemMoneyAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemKey",
                         StagedOrderChangeCustomLineItemMoneyAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { StagedOrderChangeCustomLineItemMoneyAction.builder()
+                new Object[] { "money", StagedOrderChangeCustomLineItemMoneyAction.builder()
                         .money(new com.commercetools.api.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeCustomLineItemQuantityActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeCustomLineItemQuantityActionTest.java
index d06e42960cd..3d5d8a9b71e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeCustomLineItemQuantityActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeCustomLineItemQuantityActionTest.java
@@ -1,37 +1,30 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderChangeCustomLineItemQuantityActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderChangeCustomLineItemQuantityActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderChangeCustomLineItemQuantityActionBuilder builder) {
         StagedOrderChangeCustomLineItemQuantityAction stagedOrderChangeCustomLineItemQuantityAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderChangeCustomLineItemQuantityAction)
                 .isInstanceOf(StagedOrderChangeCustomLineItemQuantityAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         StagedOrderChangeCustomLineItemQuantityAction.builder().customLineItemId("customLineItemId") },
-                new Object[] { StagedOrderChangeCustomLineItemQuantityAction.builder()
-                        .customLineItemKey("customLineItemKey") },
-                new Object[] { StagedOrderChangeCustomLineItemQuantityAction.builder().quantity(8L) } };
+                new Object[] { "customLineItemKey",
+                        StagedOrderChangeCustomLineItemQuantityAction.builder()
+                                .customLineItemKey("customLineItemKey") },
+                new Object[] { "quantity", StagedOrderChangeCustomLineItemQuantityAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeLineItemQuantityActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeLineItemQuantityActionTest.java
index 71b4989e5da..6159717dbfb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeLineItemQuantityActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeLineItemQuantityActionTest.java
@@ -1,37 +1,32 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderChangeLineItemQuantityActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderChangeLineItemQuantityActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderChangeLineItemQuantityActionBuilder builder) {
         StagedOrderChangeLineItemQuantityAction stagedOrderChangeLineItemQuantityAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderChangeLineItemQuantityAction)
                 .isInstanceOf(StagedOrderChangeLineItemQuantityAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderChangeLineItemQuantityAction.builder().lineItemId("lineItemId") },
-                new Object[] { StagedOrderChangeLineItemQuantityAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { StagedOrderChangeLineItemQuantityAction.builder().quantity(8L) },
-                new Object[] { StagedOrderChangeLineItemQuantityAction.builder()
-                        .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { StagedOrderChangeLineItemQuantityAction.builder()
+                new Object[] { "lineItemId",
+                        StagedOrderChangeLineItemQuantityAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        StagedOrderChangeLineItemQuantityAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "quantity", StagedOrderChangeLineItemQuantityAction.builder().quantity(8L) },
+                new Object[] { "externalPrice",
+                        StagedOrderChangeLineItemQuantityAction.builder()
+                                .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "externalTotalPrice", StagedOrderChangeLineItemQuantityAction.builder()
                         .externalTotalPrice(new com.commercetools.api.models.cart.ExternalLineItemTotalPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeOrderStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeOrderStateActionTest.java
index 0657a7c0e68..6db14dc6008 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeOrderStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeOrderStateActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderChangeOrderStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderChangeOrderStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderChangeOrderStateActionBuilder builder) {
         StagedOrderChangeOrderStateAction stagedOrderChangeOrderStateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderChangeOrderStateAction).isInstanceOf(StagedOrderChangeOrderStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderChangeOrderStateAction.builder()
+        return new Object[][] { new Object[] { "orderState", StagedOrderChangeOrderStateAction.builder()
                 .orderState(com.commercetools.api.models.order.OrderState.findEnum("Open")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangePaymentStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangePaymentStateActionTest.java
index 9cf1b0bbffc..4d647984499 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangePaymentStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangePaymentStateActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderChangePaymentStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderChangePaymentStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderChangePaymentStateActionBuilder builder) {
         StagedOrderChangePaymentStateAction stagedOrderChangePaymentStateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderChangePaymentStateAction)
                 .isInstanceOf(StagedOrderChangePaymentStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderChangePaymentStateAction.builder()
+        return new Object[][] { new Object[] { "paymentState", StagedOrderChangePaymentStateAction.builder()
                 .paymentState(com.commercetools.api.models.order.PaymentState.findEnum("BalanceDue")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeShipmentStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeShipmentStateActionTest.java
index 670bf920117..1719b4b8b14 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeShipmentStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeShipmentStateActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderChangeShipmentStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderChangeShipmentStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderChangeShipmentStateActionBuilder builder) {
         StagedOrderChangeShipmentStateAction stagedOrderChangeShipmentStateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderChangeShipmentStateAction)
                 .isInstanceOf(StagedOrderChangeShipmentStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderChangeShipmentStateAction.builder()
+        return new Object[][] { new Object[] { "shipmentState", StagedOrderChangeShipmentStateAction.builder()
                 .shipmentState(com.commercetools.api.models.order.ShipmentState.findEnum("Shipped")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeTaxCalculationModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeTaxCalculationModeActionTest.java
index 72960f7fcee..8c2b01d4427 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeTaxCalculationModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeTaxCalculationModeActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderChangeTaxCalculationModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderChangeTaxCalculationModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderChangeTaxCalculationModeActionBuilder builder) {
         StagedOrderChangeTaxCalculationModeAction stagedOrderChangeTaxCalculationModeAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderChangeTaxCalculationModeAction)
                 .isInstanceOf(StagedOrderChangeTaxCalculationModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderChangeTaxCalculationModeAction.builder()
+        return new Object[][] { new Object[] { "taxCalculationMode", StagedOrderChangeTaxCalculationModeAction.builder()
                 .taxCalculationMode(com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeTaxModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeTaxModeActionTest.java
index 402959e9623..984518c862e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeTaxModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeTaxModeActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderChangeTaxModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderChangeTaxModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderChangeTaxModeActionBuilder builder) {
         StagedOrderChangeTaxModeAction stagedOrderChangeTaxModeAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderChangeTaxModeAction).isInstanceOf(StagedOrderChangeTaxModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderChangeTaxModeAction.builder()
+        return new Object[][] { new Object[] { "taxMode", StagedOrderChangeTaxModeAction.builder()
                 .taxMode(com.commercetools.api.models.cart.TaxMode.findEnum("Platform")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeTaxRoundingModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeTaxRoundingModeActionTest.java
index beb5dbaf31a..0c4d34cd32d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeTaxRoundingModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderChangeTaxRoundingModeActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderChangeTaxRoundingModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderChangeTaxRoundingModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderChangeTaxRoundingModeActionBuilder builder) {
         StagedOrderChangeTaxRoundingModeAction stagedOrderChangeTaxRoundingModeAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderChangeTaxRoundingModeAction)
                 .isInstanceOf(StagedOrderChangeTaxRoundingModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderChangeTaxRoundingModeAction.builder()
+        return new Object[][] { new Object[] { "taxRoundingMode", StagedOrderChangeTaxRoundingModeAction.builder()
                 .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderImportCustomLineItemStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderImportCustomLineItemStateActionTest.java
index d60c561cfa0..131b4940749 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderImportCustomLineItemStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderImportCustomLineItemStateActionTest.java
@@ -3,37 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderImportCustomLineItemStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderImportCustomLineItemStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderImportCustomLineItemStateActionBuilder builder) {
         StagedOrderImportCustomLineItemStateAction stagedOrderImportCustomLineItemStateAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderImportCustomLineItemStateAction)
                 .isInstanceOf(StagedOrderImportCustomLineItemStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         StagedOrderImportCustomLineItemStateAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemKey",
                         StagedOrderImportCustomLineItemStateAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { StagedOrderImportCustomLineItemStateAction.builder()
+                new Object[] { "state", StagedOrderImportCustomLineItemStateAction.builder()
                         .state(Collections.singletonList(new com.commercetools.api.models.order.ItemStateImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderImportLineItemStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderImportLineItemStateActionTest.java
index 3797ed868f4..a0e9c264a04 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderImportLineItemStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderImportLineItemStateActionTest.java
@@ -3,34 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderImportLineItemStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderImportLineItemStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderImportLineItemStateActionBuilder builder) {
         StagedOrderImportLineItemStateAction stagedOrderImportLineItemStateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderImportLineItemStateAction)
                 .isInstanceOf(StagedOrderImportLineItemStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderImportLineItemStateAction.builder().lineItemId("lineItemId") },
-                new Object[] { StagedOrderImportLineItemStateAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { StagedOrderImportLineItemStateAction.builder()
+                new Object[] { "lineItemId", StagedOrderImportLineItemStateAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        StagedOrderImportLineItemStateAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "state", StagedOrderImportLineItemStateAction.builder()
                         .state(Collections.singletonList(new com.commercetools.api.models.order.ItemStateImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveCustomLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveCustomLineItemActionTest.java
index bf1de4086d1..c30a500cc8b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveCustomLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveCustomLineItemActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderRemoveCustomLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderRemoveCustomLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderRemoveCustomLineItemActionBuilder builder) {
         StagedOrderRemoveCustomLineItemAction stagedOrderRemoveCustomLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderRemoveCustomLineItemAction)
                 .isInstanceOf(StagedOrderRemoveCustomLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderRemoveCustomLineItemAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemId",
+                        StagedOrderRemoveCustomLineItemAction.builder().customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
                         StagedOrderRemoveCustomLineItemAction.builder().customLineItemKey("customLineItemKey") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveDeliveryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveDeliveryActionTest.java
index ce241217e66..39741e3b4e3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveDeliveryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveDeliveryActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderRemoveDeliveryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderRemoveDeliveryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderRemoveDeliveryActionBuilder builder) {
         StagedOrderRemoveDeliveryAction stagedOrderRemoveDeliveryAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderRemoveDeliveryAction).isInstanceOf(StagedOrderRemoveDeliveryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderRemoveDeliveryAction.builder().deliveryId("deliveryId") },
-                new Object[] { StagedOrderRemoveDeliveryAction.builder().deliveryKey("deliveryKey") } };
+        return new Object[][] {
+                new Object[] { "deliveryId", StagedOrderRemoveDeliveryAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey", StagedOrderRemoveDeliveryAction.builder().deliveryKey("deliveryKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveDiscountCodeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveDiscountCodeActionTest.java
index b6c3ac890f9..c556f8bc4e6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveDiscountCodeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveDiscountCodeActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderRemoveDiscountCodeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderRemoveDiscountCodeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderRemoveDiscountCodeActionBuilder builder) {
         StagedOrderRemoveDiscountCodeAction stagedOrderRemoveDiscountCodeAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderRemoveDiscountCodeAction)
                 .isInstanceOf(StagedOrderRemoveDiscountCodeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderRemoveDiscountCodeAction.builder()
+        return new Object[][] { new Object[] { "discountCode", StagedOrderRemoveDiscountCodeAction.builder()
                 .discountCode(new com.commercetools.api.models.discount_code.DiscountCodeReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveItemShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveItemShippingAddressActionTest.java
index 4d61d3d5d6a..2addd7c245a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveItemShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveItemShippingAddressActionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderRemoveItemShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderRemoveItemShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderRemoveItemShippingAddressActionBuilder builder) {
         StagedOrderRemoveItemShippingAddressAction stagedOrderRemoveItemShippingAddressAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderRemoveItemShippingAddressAction)
                 .isInstanceOf(StagedOrderRemoveItemShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { StagedOrderRemoveItemShippingAddressAction.builder().addressKey("addressKey") } };
+        return new Object[][] { new Object[] { "addressKey",
+                StagedOrderRemoveItemShippingAddressAction.builder().addressKey("addressKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveLineItemActionTest.java
index 53de49e0bd0..864a459ba58 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveLineItemActionTest.java
@@ -1,39 +1,34 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderRemoveLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderRemoveLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderRemoveLineItemActionBuilder builder) {
         StagedOrderRemoveLineItemAction stagedOrderRemoveLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderRemoveLineItemAction).isInstanceOf(StagedOrderRemoveLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderRemoveLineItemAction.builder().lineItemId("lineItemId") },
-                new Object[] { StagedOrderRemoveLineItemAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { StagedOrderRemoveLineItemAction.builder().quantity(8L) },
-                new Object[] { StagedOrderRemoveLineItemAction.builder()
-                        .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { StagedOrderRemoveLineItemAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", StagedOrderRemoveLineItemAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", StagedOrderRemoveLineItemAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "quantity", StagedOrderRemoveLineItemAction.builder().quantity(8L) },
+                new Object[] { "externalPrice",
+                        StagedOrderRemoveLineItemAction.builder()
+                                .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "externalTotalPrice", StagedOrderRemoveLineItemAction.builder()
                         .externalTotalPrice(new com.commercetools.api.models.cart.ExternalLineItemTotalPriceImpl()) },
-                new Object[] { StagedOrderRemoveLineItemAction.builder()
-                        .shippingDetailsToRemove(
-                            new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
+                new Object[] { "shippingDetailsToRemove",
+                        StagedOrderRemoveLineItemAction.builder()
+                                .shippingDetailsToRemove(
+                                    new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveParcelFromDeliveryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveParcelFromDeliveryActionTest.java
index b361966f66b..b452fc72aab 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveParcelFromDeliveryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemoveParcelFromDeliveryActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderRemoveParcelFromDeliveryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderRemoveParcelFromDeliveryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderRemoveParcelFromDeliveryActionBuilder builder) {
         StagedOrderRemoveParcelFromDeliveryAction stagedOrderRemoveParcelFromDeliveryAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderRemoveParcelFromDeliveryAction)
                 .isInstanceOf(StagedOrderRemoveParcelFromDeliveryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderRemoveParcelFromDeliveryAction.builder().parcelId("parcelId") },
-                new Object[] { StagedOrderRemoveParcelFromDeliveryAction.builder().parcelKey("parcelKey") } };
+                new Object[] { "parcelId", StagedOrderRemoveParcelFromDeliveryAction.builder().parcelId("parcelId") },
+                new Object[] { "parcelKey",
+                        StagedOrderRemoveParcelFromDeliveryAction.builder().parcelKey("parcelKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemovePaymentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemovePaymentActionTest.java
index 9b856c01150..405bb129c38 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemovePaymentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderRemovePaymentActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderRemovePaymentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderRemovePaymentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderRemovePaymentActionBuilder builder) {
         StagedOrderRemovePaymentAction stagedOrderRemovePaymentAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderRemovePaymentAction).isInstanceOf(StagedOrderRemovePaymentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderRemovePaymentAction.builder()
+        return new Object[][] { new Object[] { "payment", StagedOrderRemovePaymentAction.builder()
                 .payment(new com.commercetools.api.models.payment.PaymentResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBillingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBillingAddressActionTest.java
index 4346a914223..704b495a75f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBillingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBillingAddressActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetBillingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetBillingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetBillingAddressActionBuilder builder) {
         StagedOrderSetBillingAddressAction stagedOrderSetBillingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetBillingAddressAction)
                 .isInstanceOf(StagedOrderSetBillingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetBillingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", StagedOrderSetBillingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBillingAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBillingAddressCustomFieldActionTest.java
index 66db6367948..d98b4ab4343 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBillingAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBillingAddressCustomFieldActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetBillingAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetBillingAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetBillingAddressCustomFieldActionBuilder builder) {
         StagedOrderSetBillingAddressCustomFieldAction stagedOrderSetBillingAddressCustomFieldAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetBillingAddressCustomFieldAction)
                 .isInstanceOf(StagedOrderSetBillingAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetBillingAddressCustomFieldAction.builder().name("name") },
-                new Object[] { StagedOrderSetBillingAddressCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "name", StagedOrderSetBillingAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StagedOrderSetBillingAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBillingAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBillingAddressCustomTypeActionTest.java
index 09de9fcb272..55594e2ce06 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBillingAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBillingAddressCustomTypeActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetBillingAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetBillingAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetBillingAddressCustomTypeActionBuilder builder) {
         StagedOrderSetBillingAddressCustomTypeAction stagedOrderSetBillingAddressCustomTypeAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetBillingAddressCustomTypeAction)
                 .isInstanceOf(StagedOrderSetBillingAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetBillingAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetBillingAddressCustomTypeAction.builder()
+                new Object[] { "type",
+                        StagedOrderSetBillingAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StagedOrderSetBillingAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBusinessUnitActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBusinessUnitActionTest.java
index f4593d792b8..3b871eb0d8f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBusinessUnitActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetBusinessUnitActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetBusinessUnitActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetBusinessUnitActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetBusinessUnitActionBuilder builder) {
         StagedOrderSetBusinessUnitAction stagedOrderSetBusinessUnitAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetBusinessUnitAction).isInstanceOf(StagedOrderSetBusinessUnitAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetBusinessUnitAction.builder()
+        return new Object[][] { new Object[] { "businessUnit", StagedOrderSetBusinessUnitAction.builder()
                 .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCountryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCountryActionTest.java
index c462ddff9e2..7a135a27cbd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCountryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCountryActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetCountryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetCountryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetCountryActionBuilder builder) {
         StagedOrderSetCountryAction stagedOrderSetCountryAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetCountryAction).isInstanceOf(StagedOrderSetCountryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetCountryAction.builder().country("country") } };
+        return new Object[][] { new Object[] { "country", StagedOrderSetCountryAction.builder().country("country") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomFieldActionTest.java
index 545bc725dc1..9d505198f94 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetCustomFieldActionBuilder builder) {
         StagedOrderSetCustomFieldAction stagedOrderSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetCustomFieldAction).isInstanceOf(StagedOrderSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetCustomFieldAction.builder().name("name") },
-                new Object[] { StagedOrderSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", StagedOrderSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StagedOrderSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemCustomFieldActionTest.java
index 102c4e6c6fe..d3da0c35f44 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemCustomFieldActionTest.java
@@ -1,38 +1,31 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetCustomLineItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetCustomLineItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetCustomLineItemCustomFieldActionBuilder builder) {
         StagedOrderSetCustomLineItemCustomFieldAction stagedOrderSetCustomLineItemCustomFieldAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetCustomLineItemCustomFieldAction)
                 .isInstanceOf(StagedOrderSetCustomLineItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         StagedOrderSetCustomLineItemCustomFieldAction.builder().customLineItemId("customLineItemId") },
-                new Object[] { StagedOrderSetCustomLineItemCustomFieldAction.builder()
-                        .customLineItemKey("customLineItemKey") },
-                new Object[] { StagedOrderSetCustomLineItemCustomFieldAction.builder().name("name") },
-                new Object[] { StagedOrderSetCustomLineItemCustomFieldAction.builder().value("value") } };
+                new Object[] { "customLineItemKey",
+                        StagedOrderSetCustomLineItemCustomFieldAction.builder()
+                                .customLineItemKey("customLineItemKey") },
+                new Object[] { "name", StagedOrderSetCustomLineItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StagedOrderSetCustomLineItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemCustomTypeActionTest.java
index 18404a54287..ae7d0c9a464 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemCustomTypeActionTest.java
@@ -1,39 +1,32 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetCustomLineItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetCustomLineItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetCustomLineItemCustomTypeActionBuilder builder) {
         StagedOrderSetCustomLineItemCustomTypeAction stagedOrderSetCustomLineItemCustomTypeAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetCustomLineItemCustomTypeAction)
                 .isInstanceOf(StagedOrderSetCustomLineItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         StagedOrderSetCustomLineItemCustomTypeAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemKey",
                         StagedOrderSetCustomLineItemCustomTypeAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { StagedOrderSetCustomLineItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetCustomLineItemCustomTypeAction.builder()
+                new Object[] { "type",
+                        StagedOrderSetCustomLineItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StagedOrderSetCustomLineItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemShippingDetailsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemShippingDetailsActionTest.java
index d513261eab4..1e5a83d1ea8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemShippingDetailsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemShippingDetailsActionTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetCustomLineItemShippingDetailsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetCustomLineItemShippingDetailsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetCustomLineItemShippingDetailsActionBuilder builder) {
         StagedOrderSetCustomLineItemShippingDetailsAction stagedOrderSetCustomLineItemShippingDetailsAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetCustomLineItemShippingDetailsAction)
                 .isInstanceOf(StagedOrderSetCustomLineItemShippingDetailsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetCustomLineItemShippingDetailsAction.builder()
-                        .customLineItemId("customLineItemId") },
-                new Object[] { StagedOrderSetCustomLineItemShippingDetailsAction.builder()
-                        .customLineItemKey("customLineItemKey") },
-                new Object[] { StagedOrderSetCustomLineItemShippingDetailsAction.builder()
+                new Object[] { "customLineItemId",
+                        StagedOrderSetCustomLineItemShippingDetailsAction.builder()
+                                .customLineItemId("customLineItemId") },
+                new Object[] { "customLineItemKey",
+                        StagedOrderSetCustomLineItemShippingDetailsAction.builder()
+                                .customLineItemKey("customLineItemKey") },
+                new Object[] { "shippingDetails", StagedOrderSetCustomLineItemShippingDetailsAction.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemTaxAmountActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemTaxAmountActionTest.java
index e7b7b2e8904..ee7cdb5d9d2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemTaxAmountActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemTaxAmountActionTest.java
@@ -1,39 +1,32 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetCustomLineItemTaxAmountActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetCustomLineItemTaxAmountActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetCustomLineItemTaxAmountActionBuilder builder) {
         StagedOrderSetCustomLineItemTaxAmountAction stagedOrderSetCustomLineItemTaxAmountAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetCustomLineItemTaxAmountAction)
                 .isInstanceOf(StagedOrderSetCustomLineItemTaxAmountAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         StagedOrderSetCustomLineItemTaxAmountAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemKey",
                         StagedOrderSetCustomLineItemTaxAmountAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { StagedOrderSetCustomLineItemTaxAmountAction.builder()
+                new Object[] { "externalTaxAmount", StagedOrderSetCustomLineItemTaxAmountAction.builder()
                         .externalTaxAmount(new com.commercetools.api.models.cart.ExternalTaxAmountDraftImpl()) },
-                new Object[] { StagedOrderSetCustomLineItemTaxAmountAction.builder().shippingKey("shippingKey") } };
+                new Object[] { "shippingKey",
+                        StagedOrderSetCustomLineItemTaxAmountAction.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemTaxRateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemTaxRateActionTest.java
index f80c2ff7567..0cabf8a94ea 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemTaxRateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomLineItemTaxRateActionTest.java
@@ -1,38 +1,32 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetCustomLineItemTaxRateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetCustomLineItemTaxRateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetCustomLineItemTaxRateActionBuilder builder) {
         StagedOrderSetCustomLineItemTaxRateAction stagedOrderSetCustomLineItemTaxRateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetCustomLineItemTaxRateAction)
                 .isInstanceOf(StagedOrderSetCustomLineItemTaxRateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         StagedOrderSetCustomLineItemTaxRateAction.builder().customLineItemId("customLineItemId") },
-                new Object[] {
+                new Object[] { "customLineItemKey",
                         StagedOrderSetCustomLineItemTaxRateAction.builder().customLineItemKey("customLineItemKey") },
-                new Object[] { StagedOrderSetCustomLineItemTaxRateAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { StagedOrderSetCustomLineItemTaxRateAction.builder().shippingKey("shippingKey") } };
+                new Object[] { "externalTaxRate",
+                        StagedOrderSetCustomLineItemTaxRateAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "shippingKey",
+                        StagedOrderSetCustomLineItemTaxRateAction.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionTest.java
index 594bc625104..e08c25f2307 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomShippingMethodActionTest.java
@@ -1,41 +1,34 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetCustomShippingMethodActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetCustomShippingMethodActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetCustomShippingMethodActionBuilder builder) {
         StagedOrderSetCustomShippingMethodAction stagedOrderSetCustomShippingMethodAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetCustomShippingMethodAction)
                 .isInstanceOf(StagedOrderSetCustomShippingMethodAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "shippingMethodName",
                         StagedOrderSetCustomShippingMethodAction.builder().shippingMethodName("shippingMethodName") },
-                new Object[] { StagedOrderSetCustomShippingMethodAction.builder()
+                new Object[] { "shippingRate", StagedOrderSetCustomShippingMethodAction.builder()
                         .shippingRate(new com.commercetools.api.models.shipping_method.ShippingRateDraftImpl()) },
-                new Object[] { StagedOrderSetCustomShippingMethodAction.builder()
+                new Object[] { "taxCategory", StagedOrderSetCustomShippingMethodAction.builder()
                         .taxCategory(
                             new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetCustomShippingMethodAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { StagedOrderSetCustomShippingMethodAction.builder()
+                new Object[] { "externalTaxRate",
+                        StagedOrderSetCustomShippingMethodAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "custom", StagedOrderSetCustomShippingMethodAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomTypeActionTest.java
index 61027a7fd10..4e8f5e56421 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetCustomTypeActionBuilder builder) {
         StagedOrderSetCustomTypeAction stagedOrderSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetCustomTypeAction).isInstanceOf(StagedOrderSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        StagedOrderSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StagedOrderSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomerEmailActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomerEmailActionTest.java
index 509d0bc03cd..829766deef5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomerEmailActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomerEmailActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetCustomerEmailActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetCustomerEmailActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetCustomerEmailActionBuilder builder) {
         StagedOrderSetCustomerEmailAction stagedOrderSetCustomerEmailAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetCustomerEmailAction).isInstanceOf(StagedOrderSetCustomerEmailAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetCustomerEmailAction.builder().email("email") } };
+        return new Object[][] { new Object[] { "email", StagedOrderSetCustomerEmailAction.builder().email("email") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomerGroupActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomerGroupActionTest.java
index 72164dc445b..a6cb0a4f2e5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomerGroupActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomerGroupActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetCustomerGroupActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetCustomerGroupActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetCustomerGroupActionBuilder builder) {
         StagedOrderSetCustomerGroupAction stagedOrderSetCustomerGroupAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetCustomerGroupAction).isInstanceOf(StagedOrderSetCustomerGroupAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetCustomerGroupAction.builder()
-                .customerGroup(
-                    new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) } };
+        return new Object[][] { new Object[] { "customerGroup",
+                StagedOrderSetCustomerGroupAction.builder()
+                        .customerGroup(
+                            new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomerIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomerIdActionTest.java
index 9444928d2ea..2c360ab9c6f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomerIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetCustomerIdActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetCustomerIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetCustomerIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetCustomerIdActionBuilder builder) {
         StagedOrderSetCustomerIdAction stagedOrderSetCustomerIdAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetCustomerIdAction).isInstanceOf(StagedOrderSetCustomerIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetCustomerIdAction.builder().customerId("customerId") } };
+        return new Object[][] {
+                new Object[] { "customerId", StagedOrderSetCustomerIdAction.builder().customerId("customerId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryAddressActionTest.java
index d7d0691fe13..26e2be873ad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryAddressActionTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetDeliveryAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetDeliveryAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetDeliveryAddressActionBuilder builder) {
         StagedOrderSetDeliveryAddressAction stagedOrderSetDeliveryAddressAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetDeliveryAddressAction)
                 .isInstanceOf(StagedOrderSetDeliveryAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetDeliveryAddressAction.builder().deliveryId("deliveryId") },
-                new Object[] { StagedOrderSetDeliveryAddressAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { StagedOrderSetDeliveryAddressAction.builder()
+        return new Object[][] {
+                new Object[] { "deliveryId", StagedOrderSetDeliveryAddressAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey",
+                        StagedOrderSetDeliveryAddressAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "address", StagedOrderSetDeliveryAddressAction.builder()
                         .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryAddressCustomFieldActionTest.java
index 8a152ae47fd..ebb78692277 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryAddressCustomFieldActionTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetDeliveryAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetDeliveryAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetDeliveryAddressCustomFieldActionBuilder builder) {
         StagedOrderSetDeliveryAddressCustomFieldAction stagedOrderSetDeliveryAddressCustomFieldAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetDeliveryAddressCustomFieldAction)
                 .isInstanceOf(StagedOrderSetDeliveryAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetDeliveryAddressCustomFieldAction.builder().deliveryId("deliveryId") },
-                new Object[] { StagedOrderSetDeliveryAddressCustomFieldAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { StagedOrderSetDeliveryAddressCustomFieldAction.builder().name("name") },
-                new Object[] { StagedOrderSetDeliveryAddressCustomFieldAction.builder().value("value") } };
+                new Object[] { "deliveryId",
+                        StagedOrderSetDeliveryAddressCustomFieldAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey",
+                        StagedOrderSetDeliveryAddressCustomFieldAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "name", StagedOrderSetDeliveryAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StagedOrderSetDeliveryAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryAddressCustomTypeActionTest.java
index df14994141f..e153bfd5d48 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryAddressCustomTypeActionTest.java
@@ -1,37 +1,32 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetDeliveryAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetDeliveryAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetDeliveryAddressCustomTypeActionBuilder builder) {
         StagedOrderSetDeliveryAddressCustomTypeAction stagedOrderSetDeliveryAddressCustomTypeAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetDeliveryAddressCustomTypeAction)
                 .isInstanceOf(StagedOrderSetDeliveryAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetDeliveryAddressCustomTypeAction.builder().deliveryId("deliveryId") },
-                new Object[] { StagedOrderSetDeliveryAddressCustomTypeAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { StagedOrderSetDeliveryAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetDeliveryAddressCustomTypeAction.builder()
+                new Object[] { "deliveryId",
+                        StagedOrderSetDeliveryAddressCustomTypeAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey",
+                        StagedOrderSetDeliveryAddressCustomTypeAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "type",
+                        StagedOrderSetDeliveryAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StagedOrderSetDeliveryAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryCustomFieldActionTest.java
index 75c6c3b21db..60b7e949e9d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryCustomFieldActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetDeliveryCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetDeliveryCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetDeliveryCustomFieldActionBuilder builder) {
         StagedOrderSetDeliveryCustomFieldAction stagedOrderSetDeliveryCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetDeliveryCustomFieldAction)
                 .isInstanceOf(StagedOrderSetDeliveryCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetDeliveryCustomFieldAction.builder().deliveryId("deliveryId") },
-                new Object[] { StagedOrderSetDeliveryCustomFieldAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { StagedOrderSetDeliveryCustomFieldAction.builder().name("name") },
-                new Object[] { StagedOrderSetDeliveryCustomFieldAction.builder().value("value") } };
+                new Object[] { "deliveryId",
+                        StagedOrderSetDeliveryCustomFieldAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey",
+                        StagedOrderSetDeliveryCustomFieldAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "name", StagedOrderSetDeliveryCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StagedOrderSetDeliveryCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryCustomTypeActionTest.java
index b9a23382678..3c1b1e1de6e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryCustomTypeActionTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetDeliveryCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetDeliveryCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetDeliveryCustomTypeActionBuilder builder) {
         StagedOrderSetDeliveryCustomTypeAction stagedOrderSetDeliveryCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetDeliveryCustomTypeAction)
                 .isInstanceOf(StagedOrderSetDeliveryCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetDeliveryCustomTypeAction.builder().deliveryId("deliveryId") },
-                new Object[] { StagedOrderSetDeliveryCustomTypeAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { StagedOrderSetDeliveryCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetDeliveryCustomTypeAction.builder()
+                new Object[] { "deliveryId",
+                        StagedOrderSetDeliveryCustomTypeAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey",
+                        StagedOrderSetDeliveryCustomTypeAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "type",
+                        StagedOrderSetDeliveryCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StagedOrderSetDeliveryCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryItemsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryItemsActionTest.java
index be752b795b9..9ac7cccee36 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryItemsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDeliveryItemsActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetDeliveryItemsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetDeliveryItemsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetDeliveryItemsActionBuilder builder) {
         StagedOrderSetDeliveryItemsAction stagedOrderSetDeliveryItemsAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetDeliveryItemsAction).isInstanceOf(StagedOrderSetDeliveryItemsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetDeliveryItemsAction.builder().deliveryId("deliveryId") },
-                new Object[] { StagedOrderSetDeliveryItemsAction.builder().deliveryKey("deliveryKey") },
-                new Object[] { StagedOrderSetDeliveryItemsAction.builder()
+        return new Object[][] {
+                new Object[] { "deliveryId", StagedOrderSetDeliveryItemsAction.builder().deliveryId("deliveryId") },
+                new Object[] { "deliveryKey", StagedOrderSetDeliveryItemsAction.builder().deliveryKey("deliveryKey") },
+                new Object[] { "items", StagedOrderSetDeliveryItemsAction.builder()
                         .items(
                             Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDirectDiscountsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDirectDiscountsActionTest.java
index 0b00043a223..9c5e99e5932 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDirectDiscountsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetDirectDiscountsActionTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetDirectDiscountsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetDirectDiscountsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetDirectDiscountsActionBuilder builder) {
         StagedOrderSetDirectDiscountsAction stagedOrderSetDirectDiscountsAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetDirectDiscountsAction)
                 .isInstanceOf(StagedOrderSetDirectDiscountsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetDirectDiscountsAction.builder()
+        return new Object[][] { new Object[] { "discounts", StagedOrderSetDirectDiscountsAction.builder()
                 .discounts(
                     Collections.singletonList(new com.commercetools.api.models.cart.DirectDiscountDraftImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetItemShippingAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetItemShippingAddressCustomFieldActionTest.java
index d71e02c4bc4..bc698fa624e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetItemShippingAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetItemShippingAddressCustomFieldActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetItemShippingAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetItemShippingAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetItemShippingAddressCustomFieldActionBuilder builder) {
         StagedOrderSetItemShippingAddressCustomFieldAction stagedOrderSetItemShippingAddressCustomFieldAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetItemShippingAddressCustomFieldAction)
                 .isInstanceOf(StagedOrderSetItemShippingAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetItemShippingAddressCustomFieldAction.builder().addressKey("addressKey") },
-                new Object[] { StagedOrderSetItemShippingAddressCustomFieldAction.builder().name("name") },
-                new Object[] { StagedOrderSetItemShippingAddressCustomFieldAction.builder().value("value") } };
+                new Object[] { "addressKey",
+                        StagedOrderSetItemShippingAddressCustomFieldAction.builder().addressKey("addressKey") },
+                new Object[] { "name", StagedOrderSetItemShippingAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StagedOrderSetItemShippingAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetItemShippingAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetItemShippingAddressCustomTypeActionTest.java
index 4e7f0626d1b..240a61d96de 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetItemShippingAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetItemShippingAddressCustomTypeActionTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetItemShippingAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetItemShippingAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetItemShippingAddressCustomTypeActionBuilder builder) {
         StagedOrderSetItemShippingAddressCustomTypeAction stagedOrderSetItemShippingAddressCustomTypeAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetItemShippingAddressCustomTypeAction)
                 .isInstanceOf(StagedOrderSetItemShippingAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetItemShippingAddressCustomTypeAction.builder().addressKey("addressKey") },
-                new Object[] { StagedOrderSetItemShippingAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetItemShippingAddressCustomTypeAction.builder()
+                new Object[] { "addressKey",
+                        StagedOrderSetItemShippingAddressCustomTypeAction.builder().addressKey("addressKey") },
+                new Object[] { "type",
+                        StagedOrderSetItemShippingAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StagedOrderSetItemShippingAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemCustomFieldActionTest.java
index e974181b60e..e45a61c9387 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemCustomFieldActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetLineItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetLineItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetLineItemCustomFieldActionBuilder builder) {
         StagedOrderSetLineItemCustomFieldAction stagedOrderSetLineItemCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetLineItemCustomFieldAction)
                 .isInstanceOf(StagedOrderSetLineItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetLineItemCustomFieldAction.builder().lineItemId("lineItemId") },
-                new Object[] { StagedOrderSetLineItemCustomFieldAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { StagedOrderSetLineItemCustomFieldAction.builder().name("name") },
-                new Object[] { StagedOrderSetLineItemCustomFieldAction.builder().value("value") } };
+                new Object[] { "lineItemId",
+                        StagedOrderSetLineItemCustomFieldAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        StagedOrderSetLineItemCustomFieldAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "name", StagedOrderSetLineItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StagedOrderSetLineItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemCustomTypeActionTest.java
index 68f803a7f2d..142f15ce96c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemCustomTypeActionTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetLineItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetLineItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetLineItemCustomTypeActionBuilder builder) {
         StagedOrderSetLineItemCustomTypeAction stagedOrderSetLineItemCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetLineItemCustomTypeAction)
                 .isInstanceOf(StagedOrderSetLineItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetLineItemCustomTypeAction.builder().lineItemId("lineItemId") },
-                new Object[] { StagedOrderSetLineItemCustomTypeAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { StagedOrderSetLineItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetLineItemCustomTypeAction.builder()
+                new Object[] { "lineItemId",
+                        StagedOrderSetLineItemCustomTypeAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        StagedOrderSetLineItemCustomTypeAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "type",
+                        StagedOrderSetLineItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StagedOrderSetLineItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemDistributionChannelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemDistributionChannelActionTest.java
index d4281988cad..10a8124dec3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemDistributionChannelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemDistributionChannelActionTest.java
@@ -1,37 +1,32 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetLineItemDistributionChannelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetLineItemDistributionChannelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetLineItemDistributionChannelActionBuilder builder) {
         StagedOrderSetLineItemDistributionChannelAction stagedOrderSetLineItemDistributionChannelAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetLineItemDistributionChannelAction)
                 .isInstanceOf(StagedOrderSetLineItemDistributionChannelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetLineItemDistributionChannelAction.builder().lineItemId("lineItemId") },
-                new Object[] { StagedOrderSetLineItemDistributionChannelAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { StagedOrderSetLineItemDistributionChannelAction.builder()
-                        .distributionChannel(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
+                new Object[] { "lineItemId",
+                        StagedOrderSetLineItemDistributionChannelAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        StagedOrderSetLineItemDistributionChannelAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "distributionChannel",
+                        StagedOrderSetLineItemDistributionChannelAction.builder()
+                                .distributionChannel(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemPriceActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemPriceActionTest.java
index a7d4a096b9d..ce15e2a4ed8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemPriceActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemPriceActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetLineItemPriceActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetLineItemPriceActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetLineItemPriceActionBuilder builder) {
         StagedOrderSetLineItemPriceAction stagedOrderSetLineItemPriceAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetLineItemPriceAction).isInstanceOf(StagedOrderSetLineItemPriceAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetLineItemPriceAction.builder().lineItemId("lineItemId") },
-                new Object[] { StagedOrderSetLineItemPriceAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { StagedOrderSetLineItemPriceAction.builder()
+        return new Object[][] {
+                new Object[] { "lineItemId", StagedOrderSetLineItemPriceAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", StagedOrderSetLineItemPriceAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "externalPrice", StagedOrderSetLineItemPriceAction.builder()
                         .externalPrice(new com.commercetools.api.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemShippingDetailsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemShippingDetailsActionTest.java
index d1a0b204cd7..b127929fecd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemShippingDetailsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemShippingDetailsActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetLineItemShippingDetailsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetLineItemShippingDetailsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetLineItemShippingDetailsActionBuilder builder) {
         StagedOrderSetLineItemShippingDetailsAction stagedOrderSetLineItemShippingDetailsAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetLineItemShippingDetailsAction)
                 .isInstanceOf(StagedOrderSetLineItemShippingDetailsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetLineItemShippingDetailsAction.builder().lineItemId("lineItemId") },
-                new Object[] { StagedOrderSetLineItemShippingDetailsAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { StagedOrderSetLineItemShippingDetailsAction.builder()
+                new Object[] { "lineItemId",
+                        StagedOrderSetLineItemShippingDetailsAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        StagedOrderSetLineItemShippingDetailsAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "shippingDetails", StagedOrderSetLineItemShippingDetailsAction.builder()
                         .shippingDetails(new com.commercetools.api.models.cart.ItemShippingDetailsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemTaxAmountActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemTaxAmountActionTest.java
index 8aa1d31dcad..c9c174ae086 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemTaxAmountActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemTaxAmountActionTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetLineItemTaxAmountActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetLineItemTaxAmountActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetLineItemTaxAmountActionBuilder builder) {
         StagedOrderSetLineItemTaxAmountAction stagedOrderSetLineItemTaxAmountAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetLineItemTaxAmountAction)
                 .isInstanceOf(StagedOrderSetLineItemTaxAmountAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetLineItemTaxAmountAction.builder().lineItemId("lineItemId") },
-                new Object[] { StagedOrderSetLineItemTaxAmountAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { StagedOrderSetLineItemTaxAmountAction.builder()
+                new Object[] { "lineItemId", StagedOrderSetLineItemTaxAmountAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        StagedOrderSetLineItemTaxAmountAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "externalTaxAmount", StagedOrderSetLineItemTaxAmountAction.builder()
                         .externalTaxAmount(new com.commercetools.api.models.cart.ExternalTaxAmountDraftImpl()) },
-                new Object[] { StagedOrderSetLineItemTaxAmountAction.builder().shippingKey("shippingKey") } };
+                new Object[] { "shippingKey",
+                        StagedOrderSetLineItemTaxAmountAction.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemTaxRateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemTaxRateActionTest.java
index b26fbdca5bf..d5a84a160c2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemTaxRateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemTaxRateActionTest.java
@@ -1,35 +1,31 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetLineItemTaxRateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetLineItemTaxRateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetLineItemTaxRateActionBuilder builder) {
         StagedOrderSetLineItemTaxRateAction stagedOrderSetLineItemTaxRateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetLineItemTaxRateAction)
                 .isInstanceOf(StagedOrderSetLineItemTaxRateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetLineItemTaxRateAction.builder().lineItemId("lineItemId") },
-                new Object[] { StagedOrderSetLineItemTaxRateAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { StagedOrderSetLineItemTaxRateAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { StagedOrderSetLineItemTaxRateAction.builder().shippingKey("shippingKey") } };
+        return new Object[][] {
+                new Object[] { "lineItemId", StagedOrderSetLineItemTaxRateAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        StagedOrderSetLineItemTaxRateAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "externalTaxRate",
+                        StagedOrderSetLineItemTaxRateAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "shippingKey",
+                        StagedOrderSetLineItemTaxRateAction.builder().shippingKey("shippingKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemTotalPriceActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemTotalPriceActionTest.java
index 9b5662ec46f..a9477c948e9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemTotalPriceActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLineItemTotalPriceActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetLineItemTotalPriceActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetLineItemTotalPriceActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetLineItemTotalPriceActionBuilder builder) {
         StagedOrderSetLineItemTotalPriceAction stagedOrderSetLineItemTotalPriceAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetLineItemTotalPriceAction)
                 .isInstanceOf(StagedOrderSetLineItemTotalPriceAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetLineItemTotalPriceAction.builder().lineItemId("lineItemId") },
-                new Object[] { StagedOrderSetLineItemTotalPriceAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { StagedOrderSetLineItemTotalPriceAction.builder()
+                new Object[] { "lineItemId",
+                        StagedOrderSetLineItemTotalPriceAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        StagedOrderSetLineItemTotalPriceAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "externalTotalPrice", StagedOrderSetLineItemTotalPriceAction.builder()
                         .externalTotalPrice(new com.commercetools.api.models.cart.ExternalLineItemTotalPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLocaleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLocaleActionTest.java
index 4aadc132672..fef6c1f4aa6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLocaleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetLocaleActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetLocaleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetLocaleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetLocaleActionBuilder builder) {
         StagedOrderSetLocaleAction stagedOrderSetLocaleAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetLocaleAction).isInstanceOf(StagedOrderSetLocaleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetLocaleAction.builder().locale("locale") } };
+        return new Object[][] { new Object[] { "locale", StagedOrderSetLocaleAction.builder().locale("locale") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetOrderNumberActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetOrderNumberActionTest.java
index cff2c29fdab..9554e3f025c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetOrderNumberActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetOrderNumberActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetOrderNumberActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetOrderNumberActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetOrderNumberActionBuilder builder) {
         StagedOrderSetOrderNumberAction stagedOrderSetOrderNumberAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetOrderNumberAction).isInstanceOf(StagedOrderSetOrderNumberAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetOrderNumberAction.builder().orderNumber("orderNumber") } };
+        return new Object[][] {
+                new Object[] { "orderNumber", StagedOrderSetOrderNumberAction.builder().orderNumber("orderNumber") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetOrderTotalTaxActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetOrderTotalTaxActionTest.java
index 8b88f80f352..b9fc9df92f8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetOrderTotalTaxActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetOrderTotalTaxActionTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetOrderTotalTaxActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetOrderTotalTaxActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetOrderTotalTaxActionBuilder builder) {
         StagedOrderSetOrderTotalTaxAction stagedOrderSetOrderTotalTaxAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetOrderTotalTaxAction).isInstanceOf(StagedOrderSetOrderTotalTaxAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetOrderTotalTaxAction.builder()
-                        .externalTotalGross(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { StagedOrderSetOrderTotalTaxAction.builder()
+                new Object[] { "externalTotalGross",
+                        StagedOrderSetOrderTotalTaxAction.builder()
+                                .externalTotalGross(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "externalTaxPortions", StagedOrderSetOrderTotalTaxAction.builder()
                         .externalTaxPortions(
                             Collections.singletonList(new com.commercetools.api.models.cart.TaxPortionDraftImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelCustomFieldActionTest.java
index a6ad3e68735..fb048d25945 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelCustomFieldActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetParcelCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetParcelCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetParcelCustomFieldActionBuilder builder) {
         StagedOrderSetParcelCustomFieldAction stagedOrderSetParcelCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetParcelCustomFieldAction)
                 .isInstanceOf(StagedOrderSetParcelCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetParcelCustomFieldAction.builder().parcelId("parcelId") },
-                new Object[] { StagedOrderSetParcelCustomFieldAction.builder().parcelKey("parcelKey") },
-                new Object[] { StagedOrderSetParcelCustomFieldAction.builder().name("name") },
-                new Object[] { StagedOrderSetParcelCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "parcelId", StagedOrderSetParcelCustomFieldAction.builder().parcelId("parcelId") },
+                new Object[] { "parcelKey", StagedOrderSetParcelCustomFieldAction.builder().parcelKey("parcelKey") },
+                new Object[] { "name", StagedOrderSetParcelCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StagedOrderSetParcelCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelCustomTypeActionTest.java
index 0f533840eec..a6064981ff2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelCustomTypeActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetParcelCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetParcelCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetParcelCustomTypeActionBuilder builder) {
         StagedOrderSetParcelCustomTypeAction stagedOrderSetParcelCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetParcelCustomTypeAction)
                 .isInstanceOf(StagedOrderSetParcelCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetParcelCustomTypeAction.builder().parcelId("parcelId") },
-                new Object[] { StagedOrderSetParcelCustomTypeAction.builder().parcelKey("parcelKey") },
-                new Object[] { StagedOrderSetParcelCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetParcelCustomTypeAction.builder()
+        return new Object[][] {
+                new Object[] { "parcelId", StagedOrderSetParcelCustomTypeAction.builder().parcelId("parcelId") },
+                new Object[] { "parcelKey", StagedOrderSetParcelCustomTypeAction.builder().parcelKey("parcelKey") },
+                new Object[] { "type",
+                        StagedOrderSetParcelCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StagedOrderSetParcelCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelItemsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelItemsActionTest.java
index 5d64f006cfd..f7174ccf600 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelItemsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelItemsActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetParcelItemsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetParcelItemsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetParcelItemsActionBuilder builder) {
         StagedOrderSetParcelItemsAction stagedOrderSetParcelItemsAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetParcelItemsAction).isInstanceOf(StagedOrderSetParcelItemsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetParcelItemsAction.builder().parcelId("parcelId") },
-                new Object[] { StagedOrderSetParcelItemsAction.builder().parcelKey("parcelKey") },
-                new Object[] { StagedOrderSetParcelItemsAction.builder()
+        return new Object[][] {
+                new Object[] { "parcelId", StagedOrderSetParcelItemsAction.builder().parcelId("parcelId") },
+                new Object[] { "parcelKey", StagedOrderSetParcelItemsAction.builder().parcelKey("parcelKey") },
+                new Object[] { "items", StagedOrderSetParcelItemsAction.builder()
                         .items(
                             Collections.singletonList(new com.commercetools.api.models.order.DeliveryItemImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelMeasurementsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelMeasurementsActionTest.java
index 4d598fc083b..011bb230e43 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelMeasurementsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelMeasurementsActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetParcelMeasurementsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetParcelMeasurementsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetParcelMeasurementsActionBuilder builder) {
         StagedOrderSetParcelMeasurementsAction stagedOrderSetParcelMeasurementsAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetParcelMeasurementsAction)
                 .isInstanceOf(StagedOrderSetParcelMeasurementsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetParcelMeasurementsAction.builder().parcelId("parcelId") },
-                new Object[] { StagedOrderSetParcelMeasurementsAction.builder().parcelKey("parcelKey") },
-                new Object[] { StagedOrderSetParcelMeasurementsAction.builder()
+        return new Object[][] {
+                new Object[] { "parcelId", StagedOrderSetParcelMeasurementsAction.builder().parcelId("parcelId") },
+                new Object[] { "parcelKey", StagedOrderSetParcelMeasurementsAction.builder().parcelKey("parcelKey") },
+                new Object[] { "measurements", StagedOrderSetParcelMeasurementsAction.builder()
                         .measurements(new com.commercetools.api.models.order.ParcelMeasurementsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelTrackingDataActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelTrackingDataActionTest.java
index a2b9f452e05..c2c07692674 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelTrackingDataActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetParcelTrackingDataActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetParcelTrackingDataActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetParcelTrackingDataActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetParcelTrackingDataActionBuilder builder) {
         StagedOrderSetParcelTrackingDataAction stagedOrderSetParcelTrackingDataAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetParcelTrackingDataAction)
                 .isInstanceOf(StagedOrderSetParcelTrackingDataAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetParcelTrackingDataAction.builder().parcelId("parcelId") },
-                new Object[] { StagedOrderSetParcelTrackingDataAction.builder().parcelKey("parcelKey") },
-                new Object[] { StagedOrderSetParcelTrackingDataAction.builder()
+        return new Object[][] {
+                new Object[] { "parcelId", StagedOrderSetParcelTrackingDataAction.builder().parcelId("parcelId") },
+                new Object[] { "parcelKey", StagedOrderSetParcelTrackingDataAction.builder().parcelKey("parcelKey") },
+                new Object[] { "trackingData", StagedOrderSetParcelTrackingDataAction.builder()
                         .trackingData(new com.commercetools.api.models.order.TrackingDataImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetPurchaseOrderNumberActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetPurchaseOrderNumberActionTest.java
index c6a1ec63262..37bb5c6af2a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetPurchaseOrderNumberActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetPurchaseOrderNumberActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetPurchaseOrderNumberActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetPurchaseOrderNumberActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetPurchaseOrderNumberActionBuilder builder) {
         StagedOrderSetPurchaseOrderNumberAction stagedOrderSetPurchaseOrderNumberAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetPurchaseOrderNumberAction)
                 .isInstanceOf(StagedOrderSetPurchaseOrderNumberAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "purchaseOrderNumber",
                 StagedOrderSetPurchaseOrderNumberAction.builder().purchaseOrderNumber("purchaseOrderNumber") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnInfoActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnInfoActionTest.java
index afd114bfb28..d2ebd8334c5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnInfoActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnInfoActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetReturnInfoActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetReturnInfoActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetReturnInfoActionBuilder builder) {
         StagedOrderSetReturnInfoAction stagedOrderSetReturnInfoAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetReturnInfoAction).isInstanceOf(StagedOrderSetReturnInfoAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetReturnInfoAction.builder()
+        return new Object[][] { new Object[] { "items", StagedOrderSetReturnInfoAction.builder()
                 .items(Collections.singletonList(new com.commercetools.api.models.order.ReturnInfoDraftImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnItemCustomFieldActionTest.java
index acb2b33377d..d2dd20f2678 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnItemCustomFieldActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetReturnItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetReturnItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetReturnItemCustomFieldActionBuilder builder) {
         StagedOrderSetReturnItemCustomFieldAction stagedOrderSetReturnItemCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetReturnItemCustomFieldAction)
                 .isInstanceOf(StagedOrderSetReturnItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetReturnItemCustomFieldAction.builder().returnItemId("returnItemId") },
-                new Object[] { StagedOrderSetReturnItemCustomFieldAction.builder().returnItemKey("returnItemKey") },
-                new Object[] { StagedOrderSetReturnItemCustomFieldAction.builder().name("name") },
-                new Object[] { StagedOrderSetReturnItemCustomFieldAction.builder().value("value") } };
+                new Object[] { "returnItemId",
+                        StagedOrderSetReturnItemCustomFieldAction.builder().returnItemId("returnItemId") },
+                new Object[] { "returnItemKey",
+                        StagedOrderSetReturnItemCustomFieldAction.builder().returnItemKey("returnItemKey") },
+                new Object[] { "name", StagedOrderSetReturnItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StagedOrderSetReturnItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnItemCustomTypeActionTest.java
index 68c43a489a7..033ab4045f6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnItemCustomTypeActionTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetReturnItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetReturnItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetReturnItemCustomTypeActionBuilder builder) {
         StagedOrderSetReturnItemCustomTypeAction stagedOrderSetReturnItemCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetReturnItemCustomTypeAction)
                 .isInstanceOf(StagedOrderSetReturnItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetReturnItemCustomTypeAction.builder().returnItemId("returnItemId") },
-                new Object[] { StagedOrderSetReturnItemCustomTypeAction.builder().returnItemKey("returnItemKey") },
-                new Object[] { StagedOrderSetReturnItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetReturnItemCustomTypeAction.builder()
+                new Object[] { "returnItemId",
+                        StagedOrderSetReturnItemCustomTypeAction.builder().returnItemId("returnItemId") },
+                new Object[] { "returnItemKey",
+                        StagedOrderSetReturnItemCustomTypeAction.builder().returnItemKey("returnItemKey") },
+                new Object[] { "type",
+                        StagedOrderSetReturnItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StagedOrderSetReturnItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnPaymentStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnPaymentStateActionTest.java
index b670514ac09..304bce60cc9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnPaymentStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnPaymentStateActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetReturnPaymentStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetReturnPaymentStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetReturnPaymentStateActionBuilder builder) {
         StagedOrderSetReturnPaymentStateAction stagedOrderSetReturnPaymentStateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetReturnPaymentStateAction)
                 .isInstanceOf(StagedOrderSetReturnPaymentStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetReturnPaymentStateAction.builder().returnItemId("returnItemId") },
-                new Object[] { StagedOrderSetReturnPaymentStateAction.builder().returnItemKey("returnItemKey") },
-                new Object[] { StagedOrderSetReturnPaymentStateAction.builder()
+                new Object[] { "returnItemId",
+                        StagedOrderSetReturnPaymentStateAction.builder().returnItemId("returnItemId") },
+                new Object[] { "returnItemKey",
+                        StagedOrderSetReturnPaymentStateAction.builder().returnItemKey("returnItemKey") },
+                new Object[] { "paymentState", StagedOrderSetReturnPaymentStateAction.builder()
                         .paymentState(
                             com.commercetools.api.models.order.ReturnPaymentState.findEnum("NonRefundable")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnShipmentStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnShipmentStateActionTest.java
index 98859349ec8..048213d01e2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnShipmentStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetReturnShipmentStateActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetReturnShipmentStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetReturnShipmentStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetReturnShipmentStateActionBuilder builder) {
         StagedOrderSetReturnShipmentStateAction stagedOrderSetReturnShipmentStateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetReturnShipmentStateAction)
                 .isInstanceOf(StagedOrderSetReturnShipmentStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetReturnShipmentStateAction.builder().returnItemId("returnItemId") },
-                new Object[] { StagedOrderSetReturnShipmentStateAction.builder().returnItemKey("returnItemKey") },
-                new Object[] { StagedOrderSetReturnShipmentStateAction.builder()
+                new Object[] { "returnItemId",
+                        StagedOrderSetReturnShipmentStateAction.builder().returnItemId("returnItemId") },
+                new Object[] { "returnItemKey",
+                        StagedOrderSetReturnShipmentStateAction.builder().returnItemKey("returnItemKey") },
+                new Object[] { "shipmentState", StagedOrderSetReturnShipmentStateAction.builder()
                         .shipmentState(com.commercetools.api.models.order.ReturnShipmentState.findEnum("Advised")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressActionTest.java
index 1c4d291cf66..3fa60dd9718 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetShippingAddressActionBuilder builder) {
         StagedOrderSetShippingAddressAction stagedOrderSetShippingAddressAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetShippingAddressAction)
                 .isInstanceOf(StagedOrderSetShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetShippingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", StagedOrderSetShippingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionTest.java
index 6f826482133..0ee5b6161f4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndCustomShippingMethodActionTest.java
@@ -1,44 +1,39 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetShippingAddressAndCustomShippingMethodActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetShippingAddressAndCustomShippingMethodActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetShippingAddressAndCustomShippingMethodActionBuilder builder) {
         StagedOrderSetShippingAddressAndCustomShippingMethodAction stagedOrderSetShippingAddressAndCustomShippingMethodAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetShippingAddressAndCustomShippingMethodAction)
                 .isInstanceOf(StagedOrderSetShippingAddressAndCustomShippingMethodAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder()
-                        .address(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder()
-                        .shippingMethodName("shippingMethodName") },
-                new Object[] { StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder()
+                new Object[] { "address",
+                        StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder()
+                                .address(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "shippingMethodName",
+                        StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder()
+                                .shippingMethodName("shippingMethodName") },
+                new Object[] { "shippingRate", StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder()
                         .shippingRate(new com.commercetools.api.models.shipping_method.ShippingRateDraftImpl()) },
-                new Object[] { StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder()
+                new Object[] { "taxCategory", StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder()
                         .taxCategory(
                             new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder()
-                        .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
-                new Object[] { StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder()
+                new Object[] { "externalTaxRate",
+                        StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder()
+                                .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) },
+                new Object[] { "custom", StagedOrderSetShippingAddressAndCustomShippingMethodAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndShippingMethodActionTest.java
index 514acd97940..a53eaff5d23 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndShippingMethodActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressAndShippingMethodActionTest.java
@@ -1,38 +1,31 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetShippingAddressAndShippingMethodActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetShippingAddressAndShippingMethodActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetShippingAddressAndShippingMethodActionBuilder builder) {
         StagedOrderSetShippingAddressAndShippingMethodAction stagedOrderSetShippingAddressAndShippingMethodAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetShippingAddressAndShippingMethodAction)
                 .isInstanceOf(StagedOrderSetShippingAddressAndShippingMethodAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetShippingAddressAndShippingMethodAction.builder()
-                        .address(new com.commercetools.api.models.common.BaseAddressImpl()) },
-                new Object[] { StagedOrderSetShippingAddressAndShippingMethodAction.builder()
+                new Object[] { "address",
+                        StagedOrderSetShippingAddressAndShippingMethodAction.builder()
+                                .address(new com.commercetools.api.models.common.BaseAddressImpl()) },
+                new Object[] { "shippingMethod", StagedOrderSetShippingAddressAndShippingMethodAction.builder()
                         .shippingMethod(
                             new com.commercetools.api.models.shipping_method.ShippingMethodResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetShippingAddressAndShippingMethodAction.builder()
+                new Object[] { "externalTaxRate", StagedOrderSetShippingAddressAndShippingMethodAction.builder()
                         .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressCustomFieldActionTest.java
index 26e0516920d..3f0b4bf7a79 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressCustomFieldActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetShippingAddressCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetShippingAddressCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetShippingAddressCustomFieldActionBuilder builder) {
         StagedOrderSetShippingAddressCustomFieldAction stagedOrderSetShippingAddressCustomFieldAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetShippingAddressCustomFieldAction)
                 .isInstanceOf(StagedOrderSetShippingAddressCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetShippingAddressCustomFieldAction.builder().name("name") },
-                new Object[] { StagedOrderSetShippingAddressCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "name", StagedOrderSetShippingAddressCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StagedOrderSetShippingAddressCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressCustomTypeActionTest.java
index 3214cedf4c6..92d9121b9ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingAddressCustomTypeActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetShippingAddressCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetShippingAddressCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetShippingAddressCustomTypeActionBuilder builder) {
         StagedOrderSetShippingAddressCustomTypeAction stagedOrderSetShippingAddressCustomTypeAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetShippingAddressCustomTypeAction)
                 .isInstanceOf(StagedOrderSetShippingAddressCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetShippingAddressCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetShippingAddressCustomTypeAction.builder()
+                new Object[] { "type",
+                        StagedOrderSetShippingAddressCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StagedOrderSetShippingAddressCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingCustomFieldActionTest.java
index 9794b5c544e..74fd7a35167 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingCustomFieldActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetShippingCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetShippingCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetShippingCustomFieldActionBuilder builder) {
         StagedOrderSetShippingCustomFieldAction stagedOrderSetShippingCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetShippingCustomFieldAction)
                 .isInstanceOf(StagedOrderSetShippingCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetShippingCustomFieldAction.builder().shippingKey("shippingKey") },
-                new Object[] { StagedOrderSetShippingCustomFieldAction.builder().name("name") },
-                new Object[] { StagedOrderSetShippingCustomFieldAction.builder().value("value") } };
+                new Object[] { "shippingKey",
+                        StagedOrderSetShippingCustomFieldAction.builder().shippingKey("shippingKey") },
+                new Object[] { "name", StagedOrderSetShippingCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StagedOrderSetShippingCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingCustomTypeActionTest.java
index ef6f4d6398f..820c851261b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingCustomTypeActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetShippingCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetShippingCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetShippingCustomTypeActionBuilder builder) {
         StagedOrderSetShippingCustomTypeAction stagedOrderSetShippingCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetShippingCustomTypeAction)
                 .isInstanceOf(StagedOrderSetShippingCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetShippingCustomTypeAction.builder().shippingKey("shippingKey") },
-                new Object[] { StagedOrderSetShippingCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetShippingCustomTypeAction.builder()
+                new Object[] { "shippingKey",
+                        StagedOrderSetShippingCustomTypeAction.builder().shippingKey("shippingKey") },
+                new Object[] { "type",
+                        StagedOrderSetShippingCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StagedOrderSetShippingCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingMethodActionTest.java
index 31eff7054bb..a83a4d931a4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingMethodActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingMethodActionTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetShippingMethodActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetShippingMethodActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetShippingMethodActionBuilder builder) {
         StagedOrderSetShippingMethodAction stagedOrderSetShippingMethodAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetShippingMethodAction)
                 .isInstanceOf(StagedOrderSetShippingMethodAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetShippingMethodAction.builder()
+                new Object[] { "shippingMethod", StagedOrderSetShippingMethodAction.builder()
                         .shippingMethod(
                             new com.commercetools.api.models.shipping_method.ShippingMethodResourceIdentifierImpl()) },
-                new Object[] { StagedOrderSetShippingMethodAction.builder()
+                new Object[] { "externalTaxRate", StagedOrderSetShippingMethodAction.builder()
                         .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingMethodTaxAmountActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingMethodTaxAmountActionTest.java
index 8a7f55fe586..7506678fc82 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingMethodTaxAmountActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingMethodTaxAmountActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetShippingMethodTaxAmountActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetShippingMethodTaxAmountActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetShippingMethodTaxAmountActionBuilder builder) {
         StagedOrderSetShippingMethodTaxAmountAction stagedOrderSetShippingMethodTaxAmountAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderSetShippingMethodTaxAmountAction)
                 .isInstanceOf(StagedOrderSetShippingMethodTaxAmountAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetShippingMethodTaxAmountAction.builder().shippingKey("shippingKey") },
-                new Object[] { StagedOrderSetShippingMethodTaxAmountAction.builder()
+                new Object[] { "shippingKey",
+                        StagedOrderSetShippingMethodTaxAmountAction.builder().shippingKey("shippingKey") },
+                new Object[] { "externalTaxAmount", StagedOrderSetShippingMethodTaxAmountAction.builder()
                         .externalTaxAmount(new com.commercetools.api.models.cart.ExternalTaxAmountDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingMethodTaxRateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingMethodTaxRateActionTest.java
index 708484bb4cb..4da27297379 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingMethodTaxRateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingMethodTaxRateActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetShippingMethodTaxRateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetShippingMethodTaxRateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetShippingMethodTaxRateActionBuilder builder) {
         StagedOrderSetShippingMethodTaxRateAction stagedOrderSetShippingMethodTaxRateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetShippingMethodTaxRateAction)
                 .isInstanceOf(StagedOrderSetShippingMethodTaxRateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderSetShippingMethodTaxRateAction.builder().shippingKey("shippingKey") },
-                new Object[] { StagedOrderSetShippingMethodTaxRateAction.builder()
+                new Object[] { "shippingKey",
+                        StagedOrderSetShippingMethodTaxRateAction.builder().shippingKey("shippingKey") },
+                new Object[] { "externalTaxRate", StagedOrderSetShippingMethodTaxRateAction.builder()
                         .externalTaxRate(new com.commercetools.api.models.cart.ExternalTaxRateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingRateInputActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingRateInputActionTest.java
index 68a8a8d488a..6cac56feb05 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingRateInputActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetShippingRateInputActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetShippingRateInputActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetShippingRateInputActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetShippingRateInputActionBuilder builder) {
         StagedOrderSetShippingRateInputAction stagedOrderSetShippingRateInputAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetShippingRateInputAction)
                 .isInstanceOf(StagedOrderSetShippingRateInputAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetShippingRateInputAction.builder()
+        return new Object[][] { new Object[] { "shippingRateInput", StagedOrderSetShippingRateInputAction.builder()
                 .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetStoreActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetStoreActionTest.java
index 3b65fc23b1c..c76071a200c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetStoreActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderSetStoreActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderSetStoreActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderSetStoreActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderSetStoreActionBuilder builder) {
         StagedOrderSetStoreAction stagedOrderSetStoreAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderSetStoreAction).isInstanceOf(StagedOrderSetStoreAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderSetStoreAction.builder()
+        return new Object[][] { new Object[] { "store", StagedOrderSetStoreAction.builder()
                 .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTest.java
index a4d2639ba23..7bb19889b9f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTransitionCustomLineItemStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTransitionCustomLineItemStateActionTest.java
index ffa8fb5d657..9a459f3a149 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTransitionCustomLineItemStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTransitionCustomLineItemStateActionTest.java
@@ -3,42 +3,37 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderTransitionCustomLineItemStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderTransitionCustomLineItemStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderTransitionCustomLineItemStateActionBuilder builder) {
         StagedOrderTransitionCustomLineItemStateAction stagedOrderTransitionCustomLineItemStateAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderTransitionCustomLineItemStateAction)
                 .isInstanceOf(StagedOrderTransitionCustomLineItemStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "customLineItemId",
                         StagedOrderTransitionCustomLineItemStateAction.builder().customLineItemId("customLineItemId") },
-                new Object[] { StagedOrderTransitionCustomLineItemStateAction.builder()
-                        .customLineItemKey("customLineItemKey") },
-                new Object[] { StagedOrderTransitionCustomLineItemStateAction.builder().quantity(8L) },
-                new Object[] { StagedOrderTransitionCustomLineItemStateAction.builder()
-                        .fromState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { StagedOrderTransitionCustomLineItemStateAction.builder()
-                        .toState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { StagedOrderTransitionCustomLineItemStateAction.builder()
+                new Object[] { "customLineItemKey",
+                        StagedOrderTransitionCustomLineItemStateAction.builder()
+                                .customLineItemKey("customLineItemKey") },
+                new Object[] { "quantity", StagedOrderTransitionCustomLineItemStateAction.builder().quantity(8L) },
+                new Object[] { "fromState",
+                        StagedOrderTransitionCustomLineItemStateAction.builder()
+                                .fromState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "toState",
+                        StagedOrderTransitionCustomLineItemStateAction.builder()
+                                .toState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "actualTransitionDate", StagedOrderTransitionCustomLineItemStateAction.builder()
                         .actualTransitionDate(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTransitionLineItemStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTransitionLineItemStateActionTest.java
index 0e1bd24eb99..b99cc94bd2e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTransitionLineItemStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTransitionLineItemStateActionTest.java
@@ -3,39 +3,35 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderTransitionLineItemStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderTransitionLineItemStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderTransitionLineItemStateActionBuilder builder) {
         StagedOrderTransitionLineItemStateAction stagedOrderTransitionLineItemStateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderTransitionLineItemStateAction)
                 .isInstanceOf(StagedOrderTransitionLineItemStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderTransitionLineItemStateAction.builder().lineItemId("lineItemId") },
-                new Object[] { StagedOrderTransitionLineItemStateAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { StagedOrderTransitionLineItemStateAction.builder().quantity(8L) },
-                new Object[] { StagedOrderTransitionLineItemStateAction.builder()
-                        .fromState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { StagedOrderTransitionLineItemStateAction.builder()
-                        .toState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { StagedOrderTransitionLineItemStateAction.builder()
+                new Object[] { "lineItemId",
+                        StagedOrderTransitionLineItemStateAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        StagedOrderTransitionLineItemStateAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "quantity", StagedOrderTransitionLineItemStateAction.builder().quantity(8L) },
+                new Object[] { "fromState",
+                        StagedOrderTransitionLineItemStateAction.builder()
+                                .fromState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "toState",
+                        StagedOrderTransitionLineItemStateAction.builder()
+                                .toState(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "actualTransitionDate", StagedOrderTransitionLineItemStateAction.builder()
                         .actualTransitionDate(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTransitionStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTransitionStateActionTest.java
index 04dba54fb05..c88e01ee5db 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTransitionStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderTransitionStateActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderTransitionStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderTransitionStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderTransitionStateActionBuilder builder) {
         StagedOrderTransitionStateAction stagedOrderTransitionStateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderTransitionStateAction).isInstanceOf(StagedOrderTransitionStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedOrderTransitionStateAction.builder()
-                        .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { StagedOrderTransitionStateAction.builder().force(true) } };
+                new Object[] { "state",
+                        StagedOrderTransitionStateAction.builder()
+                                .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "force", StagedOrderTransitionStateAction.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderUpdateItemShippingAddressActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderUpdateItemShippingAddressActionTest.java
index 51f87a4b8ac..e901c37cdb8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderUpdateItemShippingAddressActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderUpdateItemShippingAddressActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.order_edit;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderUpdateItemShippingAddressActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderUpdateItemShippingAddressActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderUpdateItemShippingAddressActionBuilder builder) {
         StagedOrderUpdateItemShippingAddressAction stagedOrderUpdateItemShippingAddressAction = builder
                 .buildUnchecked();
         Assertions.assertThat(stagedOrderUpdateItemShippingAddressAction)
                 .isInstanceOf(StagedOrderUpdateItemShippingAddressAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderUpdateItemShippingAddressAction.builder()
+        return new Object[][] { new Object[] { "address", StagedOrderUpdateItemShippingAddressAction.builder()
                 .address(new com.commercetools.api.models.common.BaseAddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderUpdateSyncInfoActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderUpdateSyncInfoActionTest.java
index bdaad3ad8fd..ffb8d552eeb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderUpdateSyncInfoActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/order_edit/StagedOrderUpdateSyncInfoActionTest.java
@@ -3,33 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedOrderUpdateSyncInfoActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedOrderUpdateSyncInfoActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedOrderUpdateSyncInfoActionBuilder builder) {
         StagedOrderUpdateSyncInfoAction stagedOrderUpdateSyncInfoAction = builder.buildUnchecked();
         Assertions.assertThat(stagedOrderUpdateSyncInfoAction).isInstanceOf(StagedOrderUpdateSyncInfoAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedOrderUpdateSyncInfoAction.builder().externalId("externalId") },
-                new Object[] { StagedOrderUpdateSyncInfoAction.builder()
-                        .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { StagedOrderUpdateSyncInfoAction.builder()
+        return new Object[][] {
+                new Object[] { "externalId", StagedOrderUpdateSyncInfoAction.builder().externalId("externalId") },
+                new Object[] { "channel",
+                        StagedOrderUpdateSyncInfoAction.builder()
+                                .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "syncedAt", StagedOrderUpdateSyncInfoAction.builder()
                         .syncedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentAddInterfaceInteractionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentAddInterfaceInteractionActionTest.java
index 13e8a993192..ea4847f9e3b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentAddInterfaceInteractionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentAddInterfaceInteractionActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentAddInterfaceInteractionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentAddInterfaceInteractionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentAddInterfaceInteractionActionBuilder builder) {
         PaymentAddInterfaceInteractionAction paymentAddInterfaceInteractionAction = builder.buildUnchecked();
         Assertions.assertThat(paymentAddInterfaceInteractionAction)
                 .isInstanceOf(PaymentAddInterfaceInteractionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentAddInterfaceInteractionAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { PaymentAddInterfaceInteractionAction.builder()
+                new Object[] { "type",
+                        PaymentAddInterfaceInteractionAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", PaymentAddInterfaceInteractionAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentAddTransactionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentAddTransactionActionTest.java
index 0060f48339f..dd537ee8be0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentAddTransactionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentAddTransactionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentAddTransactionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentAddTransactionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentAddTransactionActionBuilder builder) {
         PaymentAddTransactionAction paymentAddTransactionAction = builder.buildUnchecked();
         Assertions.assertThat(paymentAddTransactionAction).isInstanceOf(PaymentAddTransactionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentAddTransactionAction.builder()
+        return new Object[][] { new Object[] { "transaction", PaymentAddTransactionAction.builder()
                 .transaction(new com.commercetools.api.models.payment.TransactionDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeAmountPlannedActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeAmountPlannedActionTest.java
index 7d0e66bf23a..82d251726a7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeAmountPlannedActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeAmountPlannedActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentChangeAmountPlannedActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentChangeAmountPlannedActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentChangeAmountPlannedActionBuilder builder) {
         PaymentChangeAmountPlannedAction paymentChangeAmountPlannedAction = builder.buildUnchecked();
         Assertions.assertThat(paymentChangeAmountPlannedAction).isInstanceOf(PaymentChangeAmountPlannedAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentChangeAmountPlannedAction.builder()
+        return new Object[][] { new Object[] { "amount", PaymentChangeAmountPlannedAction.builder()
                 .amount(new com.commercetools.api.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeTransactionInteractionIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeTransactionInteractionIdActionTest.java
index f59535c2b31..7030e8db5a0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeTransactionInteractionIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeTransactionInteractionIdActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentChangeTransactionInteractionIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentChangeTransactionInteractionIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentChangeTransactionInteractionIdActionBuilder builder) {
         PaymentChangeTransactionInteractionIdAction paymentChangeTransactionInteractionIdAction = builder
                 .buildUnchecked();
         Assertions.assertThat(paymentChangeTransactionInteractionIdAction)
                 .isInstanceOf(PaymentChangeTransactionInteractionIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentChangeTransactionInteractionIdAction.builder().transactionId("transactionId") },
-                new Object[] { PaymentChangeTransactionInteractionIdAction.builder().interactionId("interactionId") } };
+                new Object[] { "transactionId",
+                        PaymentChangeTransactionInteractionIdAction.builder().transactionId("transactionId") },
+                new Object[] { "interactionId",
+                        PaymentChangeTransactionInteractionIdAction.builder().interactionId("interactionId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeTransactionStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeTransactionStateActionTest.java
index af1be8afa2b..004070cf1d0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeTransactionStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeTransactionStateActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentChangeTransactionStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentChangeTransactionStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentChangeTransactionStateActionBuilder builder) {
         PaymentChangeTransactionStateAction paymentChangeTransactionStateAction = builder.buildUnchecked();
         Assertions.assertThat(paymentChangeTransactionStateAction)
                 .isInstanceOf(PaymentChangeTransactionStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentChangeTransactionStateAction.builder().transactionId("transactionId") },
-                new Object[] { PaymentChangeTransactionStateAction.builder()
+                new Object[] { "transactionId",
+                        PaymentChangeTransactionStateAction.builder().transactionId("transactionId") },
+                new Object[] { "state", PaymentChangeTransactionStateAction.builder()
                         .state(com.commercetools.api.models.payment.TransactionState.findEnum("Initial")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeTransactionTimestampActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeTransactionTimestampActionTest.java
index 4522d016756..755847ffe14 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeTransactionTimestampActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentChangeTransactionTimestampActionTest.java
@@ -3,33 +3,26 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentChangeTransactionTimestampActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentChangeTransactionTimestampActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentChangeTransactionTimestampActionBuilder builder) {
         PaymentChangeTransactionTimestampAction paymentChangeTransactionTimestampAction = builder.buildUnchecked();
         Assertions.assertThat(paymentChangeTransactionTimestampAction)
                 .isInstanceOf(PaymentChangeTransactionTimestampAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentChangeTransactionTimestampAction.builder().transactionId("transactionId") },
-                new Object[] { PaymentChangeTransactionTimestampAction.builder()
+                new Object[] { "transactionId",
+                        PaymentChangeTransactionTimestampAction.builder().transactionId("transactionId") },
+                new Object[] { "timestamp", PaymentChangeTransactionTimestampAction.builder()
                         .timestamp(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentDraftTest.java
index 84c86b89e16..162915d0b0f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentDraftTest.java
@@ -3,50 +3,46 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentDraftBuilder builder) {
         PaymentDraft paymentDraft = builder.buildUnchecked();
         Assertions.assertThat(paymentDraft).isInstanceOf(PaymentDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentDraft.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) },
-                new Object[] { PaymentDraft.builder().anonymousId("anonymousId") },
-                new Object[] { PaymentDraft.builder().interfaceId("interfaceId") },
-                new Object[] {
+                new Object[] { "customer",
+                        PaymentDraft.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) },
+                new Object[] { "anonymousId", PaymentDraft.builder().anonymousId("anonymousId") },
+                new Object[] { "interfaceId", PaymentDraft.builder().interfaceId("interfaceId") },
+                new Object[] { "amountPlanned",
                         PaymentDraft.builder().amountPlanned(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { PaymentDraft.builder()
-                        .paymentMethodInfo(new com.commercetools.api.models.payment.PaymentMethodInfoImpl()) },
-                new Object[] { PaymentDraft.builder()
-                        .paymentStatus(new com.commercetools.api.models.payment.PaymentStatusDraftImpl()) },
-                new Object[] { PaymentDraft.builder()
-                        .transactions(Collections
-                                .singletonList(new com.commercetools.api.models.payment.TransactionDraftImpl())) },
-                new Object[] {
+                new Object[] { "paymentMethodInfo",
+                        PaymentDraft.builder()
+                                .paymentMethodInfo(new com.commercetools.api.models.payment.PaymentMethodInfoImpl()) },
+                new Object[] { "paymentStatus",
+                        PaymentDraft.builder()
+                                .paymentStatus(new com.commercetools.api.models.payment.PaymentStatusDraftImpl()) },
+                new Object[] { "transactions",
+                        PaymentDraft.builder()
+                                .transactions(Collections.singletonList(
+                                    new com.commercetools.api.models.payment.TransactionDraftImpl())) },
+                new Object[] { "interfaceInteractions",
                         PaymentDraft.builder()
                                 .interfaceInteractions(Collections.singletonList(
                                     new com.commercetools.api.models.type.CustomFieldsDraftImpl())) },
-                new Object[] {
+                new Object[] { "custom",
                         PaymentDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { PaymentDraft.builder().key("key") } };
+                new Object[] { "key", PaymentDraft.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentMethodInfoTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentMethodInfoTest.java
index e40368e0f8c..67926c6d3b4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentMethodInfoTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentMethodInfoTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentMethodInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentMethodInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentMethodInfoBuilder builder) {
         PaymentMethodInfo paymentMethodInfo = builder.buildUnchecked();
         Assertions.assertThat(paymentMethodInfo).isInstanceOf(PaymentMethodInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentMethodInfo.builder().paymentInterface("paymentInterface") },
-                new Object[] { PaymentMethodInfo.builder().method("method") },
-                new Object[] { PaymentMethodInfo.builder()
+        return new Object[][] {
+                new Object[] { "paymentInterface", PaymentMethodInfo.builder().paymentInterface("paymentInterface") },
+                new Object[] { "method", PaymentMethodInfo.builder().method("method") },
+                new Object[] { "name", PaymentMethodInfo.builder()
                         .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentPagedQueryResponseTest.java
index 6519f2bfca9..7122e32fcc9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentPagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentPagedQueryResponseBuilder builder) {
         PaymentPagedQueryResponse paymentPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(paymentPagedQueryResponse).isInstanceOf(PaymentPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentPagedQueryResponse.builder().limit(7L) },
-                new Object[] { PaymentPagedQueryResponse.builder().count(2L) },
-                new Object[] { PaymentPagedQueryResponse.builder().total(1L) },
-                new Object[] { PaymentPagedQueryResponse.builder().offset(3L) },
-                new Object[] { PaymentPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", PaymentPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "count", PaymentPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", PaymentPagedQueryResponse.builder().total(1L) },
+                new Object[] { "offset", PaymentPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "results", PaymentPagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.payment.PaymentImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentReferenceTest.java
index 632f7b4e455..525e23a9bc0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentReferenceTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentReferenceBuilder builder) {
         PaymentReference paymentReference = builder.buildUnchecked();
         Assertions.assertThat(paymentReference).isInstanceOf(PaymentReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentReference.builder().obj(new com.commercetools.api.models.payment.PaymentImpl()) },
-                new Object[] { PaymentReference.builder().id("id") } };
+                new Object[] { "obj",
+                        PaymentReference.builder().obj(new com.commercetools.api.models.payment.PaymentImpl()) },
+                new Object[] { "id", PaymentReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentResourceIdentifierTest.java
index cd6c7a12cdc..29b83547249 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentResourceIdentifierBuilder builder) {
         PaymentResourceIdentifier paymentResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(paymentResourceIdentifier).isInstanceOf(PaymentResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentResourceIdentifier.builder().id("id") },
-                new Object[] { PaymentResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", PaymentResourceIdentifier.builder().id("id") },
+                new Object[] { "key", PaymentResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetAnonymousIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetAnonymousIdActionTest.java
index 86d0e7c3957..5115f63ee3d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetAnonymousIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetAnonymousIdActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetAnonymousIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetAnonymousIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetAnonymousIdActionBuilder builder) {
         PaymentSetAnonymousIdAction paymentSetAnonymousIdAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetAnonymousIdAction).isInstanceOf(PaymentSetAnonymousIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentSetAnonymousIdAction.builder().anonymousId("anonymousId") } };
+        return new Object[][] {
+                new Object[] { "anonymousId", PaymentSetAnonymousIdAction.builder().anonymousId("anonymousId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetCustomFieldActionTest.java
index 5c737de3fa0..884dc550c84 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetCustomFieldActionBuilder builder) {
         PaymentSetCustomFieldAction paymentSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetCustomFieldAction).isInstanceOf(PaymentSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentSetCustomFieldAction.builder().name("name") },
-                new Object[] { PaymentSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", PaymentSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", PaymentSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetCustomTypeActionTest.java
index 51531548e6e..8c4f4ace3f5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetCustomTypeActionBuilder builder) {
         PaymentSetCustomTypeAction paymentSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetCustomTypeAction).isInstanceOf(PaymentSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { PaymentSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        PaymentSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", PaymentSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetCustomerActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetCustomerActionTest.java
index 8664ff386b2..7195df43bd5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetCustomerActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetCustomerActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetCustomerActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetCustomerActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetCustomerActionBuilder builder) {
         PaymentSetCustomerAction paymentSetCustomerAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetCustomerAction).isInstanceOf(PaymentSetCustomerAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentSetCustomerAction.builder()
+        return new Object[][] { new Object[] { "customer", PaymentSetCustomerAction.builder()
                 .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetInterfaceIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetInterfaceIdActionTest.java
index 2d66f4711d7..4dd01c4bd78 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetInterfaceIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetInterfaceIdActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetInterfaceIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetInterfaceIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetInterfaceIdActionBuilder builder) {
         PaymentSetInterfaceIdAction paymentSetInterfaceIdAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetInterfaceIdAction).isInstanceOf(PaymentSetInterfaceIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentSetInterfaceIdAction.builder().interfaceId("interfaceId") } };
+        return new Object[][] {
+                new Object[] { "interfaceId", PaymentSetInterfaceIdAction.builder().interfaceId("interfaceId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetKeyActionTest.java
index 78b6daf7497..1f379d8a9f8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetKeyActionBuilder builder) {
         PaymentSetKeyAction paymentSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetKeyAction).isInstanceOf(PaymentSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", PaymentSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetMethodInfoInterfaceActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetMethodInfoInterfaceActionTest.java
index b0406e625fd..ba8a82b3608 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetMethodInfoInterfaceActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetMethodInfoInterfaceActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetMethodInfoInterfaceActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetMethodInfoInterfaceActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetMethodInfoInterfaceActionBuilder builder) {
         PaymentSetMethodInfoInterfaceAction paymentSetMethodInfoInterfaceAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetMethodInfoInterfaceAction)
                 .isInstanceOf(PaymentSetMethodInfoInterfaceAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentSetMethodInfoInterfaceAction.builder()._interface("_interface") } };
+                new Object[] { "interface", PaymentSetMethodInfoInterfaceAction.builder()._interface("_interface") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetMethodInfoMethodActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetMethodInfoMethodActionTest.java
index feb5f89c069..6b143a954df 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetMethodInfoMethodActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetMethodInfoMethodActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetMethodInfoMethodActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetMethodInfoMethodActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetMethodInfoMethodActionBuilder builder) {
         PaymentSetMethodInfoMethodAction paymentSetMethodInfoMethodAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetMethodInfoMethodAction).isInstanceOf(PaymentSetMethodInfoMethodAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentSetMethodInfoMethodAction.builder().method("method") } };
+        return new Object[][] {
+                new Object[] { "method", PaymentSetMethodInfoMethodAction.builder().method("method") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetMethodInfoNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetMethodInfoNameActionTest.java
index 411dbbb5d15..649aae06686 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetMethodInfoNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetMethodInfoNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetMethodInfoNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetMethodInfoNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetMethodInfoNameActionBuilder builder) {
         PaymentSetMethodInfoNameAction paymentSetMethodInfoNameAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetMethodInfoNameAction).isInstanceOf(PaymentSetMethodInfoNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentSetMethodInfoNameAction.builder()
+        return new Object[][] { new Object[] { "name", PaymentSetMethodInfoNameAction.builder()
                 .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetStatusInterfaceCodeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetStatusInterfaceCodeActionTest.java
index 78d0fec4a91..3173e03debe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetStatusInterfaceCodeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetStatusInterfaceCodeActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetStatusInterfaceCodeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetStatusInterfaceCodeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetStatusInterfaceCodeActionBuilder builder) {
         PaymentSetStatusInterfaceCodeAction paymentSetStatusInterfaceCodeAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetStatusInterfaceCodeAction)
                 .isInstanceOf(PaymentSetStatusInterfaceCodeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { PaymentSetStatusInterfaceCodeAction.builder().interfaceCode("interfaceCode") } };
+        return new Object[][] { new Object[] { "interfaceCode",
+                PaymentSetStatusInterfaceCodeAction.builder().interfaceCode("interfaceCode") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetStatusInterfaceTextActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetStatusInterfaceTextActionTest.java
index 1eac3e05607..2d1bca870d9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetStatusInterfaceTextActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetStatusInterfaceTextActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetStatusInterfaceTextActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetStatusInterfaceTextActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetStatusInterfaceTextActionBuilder builder) {
         PaymentSetStatusInterfaceTextAction paymentSetStatusInterfaceTextAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetStatusInterfaceTextAction)
                 .isInstanceOf(PaymentSetStatusInterfaceTextAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { PaymentSetStatusInterfaceTextAction.builder().interfaceText("interfaceText") } };
+        return new Object[][] { new Object[] { "interfaceText",
+                PaymentSetStatusInterfaceTextAction.builder().interfaceText("interfaceText") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetTransactionCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetTransactionCustomFieldActionTest.java
index 6f716950875..b37a9da5737 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetTransactionCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetTransactionCustomFieldActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetTransactionCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetTransactionCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetTransactionCustomFieldActionBuilder builder) {
         PaymentSetTransactionCustomFieldAction paymentSetTransactionCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetTransactionCustomFieldAction)
                 .isInstanceOf(PaymentSetTransactionCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentSetTransactionCustomFieldAction.builder().transactionId("transactionId") },
-                new Object[] { PaymentSetTransactionCustomFieldAction.builder().name("name") },
-                new Object[] { PaymentSetTransactionCustomFieldAction.builder().value("value") } };
+                new Object[] { "transactionId",
+                        PaymentSetTransactionCustomFieldAction.builder().transactionId("transactionId") },
+                new Object[] { "name", PaymentSetTransactionCustomFieldAction.builder().name("name") },
+                new Object[] { "value", PaymentSetTransactionCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetTransactionCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetTransactionCustomTypeActionTest.java
index 810ac72585a..fe585a7adb0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetTransactionCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentSetTransactionCustomTypeActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentSetTransactionCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentSetTransactionCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentSetTransactionCustomTypeActionBuilder builder) {
         PaymentSetTransactionCustomTypeAction paymentSetTransactionCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(paymentSetTransactionCustomTypeAction)
                 .isInstanceOf(PaymentSetTransactionCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentSetTransactionCustomTypeAction.builder().transactionId("transactionId") },
-                new Object[] { PaymentSetTransactionCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { PaymentSetTransactionCustomTypeAction.builder()
+                new Object[] { "transactionId",
+                        PaymentSetTransactionCustomTypeAction.builder().transactionId("transactionId") },
+                new Object[] { "type",
+                        PaymentSetTransactionCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", PaymentSetTransactionCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentStatusDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentStatusDraftTest.java
index 94f866ea8bf..4256422d880 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentStatusDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentStatusDraftTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentStatusDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentStatusDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentStatusDraftBuilder builder) {
         PaymentStatusDraft paymentStatusDraft = builder.buildUnchecked();
         Assertions.assertThat(paymentStatusDraft).isInstanceOf(PaymentStatusDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentStatusDraft.builder().interfaceCode("interfaceCode") },
-                new Object[] { PaymentStatusDraft.builder().interfaceText("interfaceText") },
-                new Object[] { PaymentStatusDraft.builder()
+        return new Object[][] {
+                new Object[] { "interfaceCode", PaymentStatusDraft.builder().interfaceCode("interfaceCode") },
+                new Object[] { "interfaceText", PaymentStatusDraft.builder().interfaceText("interfaceText") },
+                new Object[] { "state", PaymentStatusDraft.builder()
                         .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentStatusTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentStatusTest.java
index f1e15dd0840..53210224ce0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentStatusTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentStatusTest.java
@@ -1,31 +1,25 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentStatusTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentStatusBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentStatusBuilder builder) {
         PaymentStatus paymentStatus = builder.buildUnchecked();
         Assertions.assertThat(paymentStatus).isInstanceOf(PaymentStatus.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentStatus.builder().interfaceCode("interfaceCode") },
-                new Object[] { PaymentStatus.builder().interfaceText("interfaceText") }, new Object[] {
+        return new Object[][] {
+                new Object[] { "interfaceCode", PaymentStatus.builder().interfaceCode("interfaceCode") },
+                new Object[] { "interfaceText", PaymentStatus.builder().interfaceText("interfaceText") },
+                new Object[] { "state",
                         PaymentStatus.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentTest.java
index 9207b8012a8..ee2e308a0a6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentTest.java
@@ -4,56 +4,54 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentBuilder builder) {
         Payment payment = builder.buildUnchecked();
         Assertions.assertThat(payment).isInstanceOf(Payment.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Payment.builder().id("id") },
-                new Object[] { Payment.builder().version(2L) },
-                new Object[] { Payment.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Payment.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Payment.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Payment.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Payment.builder().id("id") },
+                new Object[] { "version", Payment.builder().version(2L) },
+                new Object[] { "createdAt", Payment.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Payment.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        Payment.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
+                        Payment.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
+                new Object[] { "customer",
                         Payment.builder().customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { Payment.builder().anonymousId("anonymousId") },
-                new Object[] { Payment.builder().interfaceId("interfaceId") },
-                new Object[] { Payment.builder()
-                        .amountPlanned(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { Payment.builder()
-                        .paymentMethodInfo(new com.commercetools.api.models.payment.PaymentMethodInfoImpl()) },
-                new Object[] {
+                new Object[] { "anonymousId", Payment.builder().anonymousId("anonymousId") },
+                new Object[] { "interfaceId", Payment.builder().interfaceId("interfaceId") },
+                new Object[] { "amountPlanned",
+                        Payment.builder()
+                                .amountPlanned(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "paymentMethodInfo",
+                        Payment.builder()
+                                .paymentMethodInfo(new com.commercetools.api.models.payment.PaymentMethodInfoImpl()) },
+                new Object[] { "paymentStatus",
                         Payment.builder().paymentStatus(new com.commercetools.api.models.payment.PaymentStatusImpl()) },
-                new Object[] {
+                new Object[] { "transactions",
                         Payment.builder()
                                 .transactions(Collections
                                         .singletonList(new com.commercetools.api.models.payment.TransactionImpl())) },
-                new Object[] {
+                new Object[] { "interfaceInteractions",
                         Payment.builder()
                                 .interfaceInteractions(Collections
                                         .singletonList(new com.commercetools.api.models.type.CustomFieldsImpl())) },
-                new Object[] { Payment.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { Payment.builder().key("key") } };
+                new Object[] { "custom",
+                        Payment.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "key", Payment.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentTransitionStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentTransitionStateActionTest.java
index 33c812127ff..80690462620 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentTransitionStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentTransitionStateActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.payment;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentTransitionStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentTransitionStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentTransitionStateActionBuilder builder) {
         PaymentTransitionStateAction paymentTransitionStateAction = builder.buildUnchecked();
         Assertions.assertThat(paymentTransitionStateAction).isInstanceOf(PaymentTransitionStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PaymentTransitionStateAction.builder()
-                        .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { PaymentTransitionStateAction.builder().force(true) } };
+                new Object[] { "state",
+                        PaymentTransitionStateAction.builder()
+                                .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "force", PaymentTransitionStateAction.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentUpdateTest.java
index e9e8b9d1e02..18e665439ac 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/PaymentUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentUpdateBuilder builder) {
         PaymentUpdate paymentUpdate = builder.buildUnchecked();
         Assertions.assertThat(paymentUpdate).isInstanceOf(PaymentUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentUpdate.builder().version(2L) },
-                new Object[] { PaymentUpdate.builder()
-                        .actions(Collections
-                                .singletonList(new com.commercetools.api.models.payment.PaymentUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", PaymentUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        PaymentUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.payment.PaymentUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/TransactionDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/TransactionDraftTest.java
index 2d678993f81..d6317a4d450 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/TransactionDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/TransactionDraftTest.java
@@ -3,38 +3,34 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TransactionDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TransactionDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TransactionDraftBuilder builder) {
         TransactionDraft transactionDraft = builder.buildUnchecked();
         Assertions.assertThat(transactionDraft).isInstanceOf(TransactionDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { TransactionDraft.builder().timestamp(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { TransactionDraft.builder()
-                        .type(com.commercetools.api.models.payment.TransactionType.findEnum("Authorization")) },
-                new Object[] { TransactionDraft.builder().amount(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { TransactionDraft.builder().interactionId("interactionId") },
-                new Object[] { TransactionDraft.builder()
-                        .state(com.commercetools.api.models.payment.TransactionState.findEnum("Initial")) },
-                new Object[] { TransactionDraft.builder()
+                new Object[] { "timestamp",
+                        TransactionDraft.builder().timestamp(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "type",
+                        TransactionDraft.builder()
+                                .type(com.commercetools.api.models.payment.TransactionType.findEnum("Authorization")) },
+                new Object[] { "amount",
+                        TransactionDraft.builder().amount(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "interactionId", TransactionDraft.builder().interactionId("interactionId") },
+                new Object[] { "state",
+                        TransactionDraft.builder()
+                                .state(com.commercetools.api.models.payment.TransactionState.findEnum("Initial")) },
+                new Object[] { "custom", TransactionDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/TransactionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/TransactionTest.java
index 61fa34a387d..03519cc2bd3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/TransactionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/payment/TransactionTest.java
@@ -3,39 +3,34 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TransactionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TransactionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TransactionBuilder builder) {
         Transaction transaction = builder.buildUnchecked();
         Assertions.assertThat(transaction).isInstanceOf(Transaction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Transaction.builder().id("id") },
-                new Object[] { Transaction.builder().timestamp(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Transaction.builder()
-                        .type(com.commercetools.api.models.payment.TransactionType.findEnum("Authorization")) },
-                new Object[] { Transaction.builder()
-                        .amount(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { Transaction.builder().interactionId("interactionId") },
-                new Object[] { Transaction.builder()
-                        .state(com.commercetools.api.models.payment.TransactionState.findEnum("Initial")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Transaction.builder().id("id") },
+                new Object[] { "timestamp", Transaction.builder().timestamp(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "type",
+                        Transaction.builder()
+                                .type(com.commercetools.api.models.payment.TransactionType.findEnum("Authorization")) },
+                new Object[] { "amount",
+                        Transaction.builder()
+                                .amount(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "interactionId", Transaction.builder().interactionId("interactionId") },
+                new Object[] { "state",
+                        Transaction.builder()
+                                .state(com.commercetools.api.models.payment.TransactionState.findEnum("Initial")) },
+                new Object[] { "custom",
                         Transaction.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/AttributeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/AttributeTest.java
index 85e3fddfd29..7288402f244 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/AttributeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/AttributeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeBuilder builder) {
         Attribute attribute = builder.buildUnchecked();
         Assertions.assertThat(attribute).isInstanceOf(Attribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Attribute.builder().name("name") },
-                new Object[] { Attribute.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", Attribute.builder().name("name") },
+                new Object[] { "value", Attribute.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/CategoryOrderHintsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/CategoryOrderHintsTest.java
index b83a2e9cca7..4696d17051f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/CategoryOrderHintsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/CategoryOrderHintsTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryOrderHintsTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/CustomTokenizerTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/CustomTokenizerTest.java
index f33fe9943f8..c764d66d651 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/CustomTokenizerTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/CustomTokenizerTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomTokenizerTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomTokenizerBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomTokenizerBuilder builder) {
         CustomTokenizer customTokenizer = builder.buildUnchecked();
         Assertions.assertThat(customTokenizer).isInstanceOf(CustomTokenizer.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomTokenizer.builder().inputs(Collections.singletonList("inputs")) } };
+                new Object[] { "inputs", CustomTokenizer.builder().inputs(Collections.singletonList("inputs")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FacetRangeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FacetRangeTest.java
index 181f9085224..ed582c73b92 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FacetRangeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FacetRangeTest.java
@@ -1,38 +1,31 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class FacetRangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(FacetRangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, FacetRangeBuilder builder) {
         FacetRange facetRange = builder.buildUnchecked();
         Assertions.assertThat(facetRange).isInstanceOf(FacetRange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { FacetRange.builder().from(0.470235) },
-                new Object[] { FacetRange.builder().fromStr("fromStr") },
-                new Object[] { FacetRange.builder().to(0.061924815) },
-                new Object[] { FacetRange.builder().toStr("toStr") }, new Object[] { FacetRange.builder().count(2L) },
-                new Object[] { FacetRange.builder().productCount(1L) },
-                new Object[] { FacetRange.builder().total(0.60145235) },
-                new Object[] { FacetRange.builder().min(0.34761357) },
-                new Object[] { FacetRange.builder().max(0.4280588) },
-                new Object[] { FacetRange.builder().mean(0.49018955) } };
+        return new Object[][] { new Object[] { "from", FacetRange.builder().from(0.470235) },
+                new Object[] { "fromStr", FacetRange.builder().fromStr("fromStr") },
+                new Object[] { "to", FacetRange.builder().to(0.061924815) },
+                new Object[] { "toStr", FacetRange.builder().toStr("toStr") },
+                new Object[] { "count", FacetRange.builder().count(2L) },
+                new Object[] { "productCount", FacetRange.builder().productCount(1L) },
+                new Object[] { "total", FacetRange.builder().total(0.60145235) },
+                new Object[] { "min", FacetRange.builder().min(0.34761357) },
+                new Object[] { "max", FacetRange.builder().max(0.4280588) },
+                new Object[] { "mean", FacetRange.builder().mean(0.49018955) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FacetResultsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FacetResultsTest.java
index a118c37041f..35a1404e2c1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FacetResultsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FacetResultsTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class FacetResultsTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FacetTermTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FacetTermTest.java
index dbe1b573343..1aa96a5167c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FacetTermTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FacetTermTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class FacetTermTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(FacetTermBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, FacetTermBuilder builder) {
         FacetTerm facetTerm = builder.buildUnchecked();
         Assertions.assertThat(facetTerm).isInstanceOf(FacetTerm.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { FacetTerm.builder().term("term") },
-                new Object[] { FacetTerm.builder().count(2L) }, new Object[] { FacetTerm.builder().productCount(1L) } };
+        return new Object[][] { new Object[] { "term", FacetTerm.builder().term("term") },
+                new Object[] { "count", FacetTerm.builder().count(2L) },
+                new Object[] { "productCount", FacetTerm.builder().productCount(1L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FilteredFacetResultTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FilteredFacetResultTest.java
index 4e52ba639b5..36b6a97aa5e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FilteredFacetResultTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/FilteredFacetResultTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class FilteredFacetResultTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(FilteredFacetResultBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, FilteredFacetResultBuilder builder) {
         FilteredFacetResult filteredFacetResult = builder.buildUnchecked();
         Assertions.assertThat(filteredFacetResult).isInstanceOf(FilteredFacetResult.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { FilteredFacetResult.builder().count(2L) },
-                new Object[] { FilteredFacetResult.builder().productCount(1L) } };
+        return new Object[][] { new Object[] { "count", FilteredFacetResult.builder().count(2L) },
+                new Object[] { "productCount", FilteredFacetResult.builder().productCount(1L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddAssetActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddAssetActionTest.java
index e72f4dd0a61..bd7a1bbbbf0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddAssetActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddAssetActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductAddAssetActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductAddAssetActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductAddAssetActionBuilder builder) {
         ProductAddAssetAction productAddAssetAction = builder.buildUnchecked();
         Assertions.assertThat(productAddAssetAction).isInstanceOf(ProductAddAssetAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductAddAssetAction.builder().variantId(5L) },
-                new Object[] { ProductAddAssetAction.builder().sku("sku") },
-                new Object[] { ProductAddAssetAction.builder().staged(true) },
-                new Object[] { ProductAddAssetAction.builder()
-                        .asset(new com.commercetools.api.models.common.AssetDraftImpl()) },
-                new Object[] { ProductAddAssetAction.builder().position(4) } };
+        return new Object[][] { new Object[] { "variantId", ProductAddAssetAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductAddAssetAction.builder().sku("sku") },
+                new Object[] { "staged", ProductAddAssetAction.builder().staged(true) },
+                new Object[] { "asset",
+                        ProductAddAssetAction.builder()
+                                .asset(new com.commercetools.api.models.common.AssetDraftImpl()) },
+                new Object[] { "position", ProductAddAssetAction.builder().position(4) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddExternalImageActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddExternalImageActionTest.java
index fdb6572b880..00b59e97ff0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddExternalImageActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddExternalImageActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductAddExternalImageActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductAddExternalImageActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductAddExternalImageActionBuilder builder) {
         ProductAddExternalImageAction productAddExternalImageAction = builder.buildUnchecked();
         Assertions.assertThat(productAddExternalImageAction).isInstanceOf(ProductAddExternalImageAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductAddExternalImageAction.builder().variantId(5L) },
-                new Object[] { ProductAddExternalImageAction.builder().sku("sku") },
-                new Object[] { ProductAddExternalImageAction.builder()
-                        .image(new com.commercetools.api.models.common.ImageImpl()) },
-                new Object[] { ProductAddExternalImageAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductAddExternalImageAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductAddExternalImageAction.builder().sku("sku") },
+                new Object[] { "image",
+                        ProductAddExternalImageAction.builder()
+                                .image(new com.commercetools.api.models.common.ImageImpl()) },
+                new Object[] { "staged", ProductAddExternalImageAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddPriceActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddPriceActionTest.java
index a4cd30498a2..2638ce5450e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddPriceActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddPriceActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductAddPriceActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductAddPriceActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductAddPriceActionBuilder builder) {
         ProductAddPriceAction productAddPriceAction = builder.buildUnchecked();
         Assertions.assertThat(productAddPriceAction).isInstanceOf(ProductAddPriceAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductAddPriceAction.builder().variantId(5L) },
-                new Object[] { ProductAddPriceAction.builder().sku("sku") },
-                new Object[] { ProductAddPriceAction.builder()
-                        .price(new com.commercetools.api.models.common.PriceDraftImpl()) },
-                new Object[] { ProductAddPriceAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductAddPriceAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductAddPriceAction.builder().sku("sku") },
+                new Object[] { "price",
+                        ProductAddPriceAction.builder()
+                                .price(new com.commercetools.api.models.common.PriceDraftImpl()) },
+                new Object[] { "staged", ProductAddPriceAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddToCategoryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddToCategoryActionTest.java
index 7ff15c240ce..d015adc9b16 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddToCategoryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddToCategoryActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductAddToCategoryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductAddToCategoryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductAddToCategoryActionBuilder builder) {
         ProductAddToCategoryAction productAddToCategoryAction = builder.buildUnchecked();
         Assertions.assertThat(productAddToCategoryAction).isInstanceOf(ProductAddToCategoryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductAddToCategoryAction.builder()
-                        .category(new com.commercetools.api.models.category.CategoryResourceIdentifierImpl()) },
-                new Object[] { ProductAddToCategoryAction.builder().orderHint("orderHint") },
-                new Object[] { ProductAddToCategoryAction.builder().staged(true) } };
+                new Object[] { "category",
+                        ProductAddToCategoryAction.builder()
+                                .category(new com.commercetools.api.models.category.CategoryResourceIdentifierImpl()) },
+                new Object[] { "orderHint", ProductAddToCategoryAction.builder().orderHint("orderHint") },
+                new Object[] { "staged", ProductAddToCategoryAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddVariantActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddVariantActionTest.java
index e672ac37710..d9eebb99ead 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddVariantActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductAddVariantActionTest.java
@@ -3,41 +3,35 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductAddVariantActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductAddVariantActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductAddVariantActionBuilder builder) {
         ProductAddVariantAction productAddVariantAction = builder.buildUnchecked();
         Assertions.assertThat(productAddVariantAction).isInstanceOf(ProductAddVariantAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductAddVariantAction.builder().sku("sku") },
-                new Object[] { ProductAddVariantAction.builder().key("key") },
-                new Object[] { ProductAddVariantAction.builder()
-                        .prices(Collections.singletonList(new com.commercetools.api.models.common.PriceDraftImpl())) },
-                new Object[] { ProductAddVariantAction.builder()
+        return new Object[][] { new Object[] { "sku", ProductAddVariantAction.builder().sku("sku") },
+                new Object[] { "key", ProductAddVariantAction.builder().key("key") },
+                new Object[] { "prices",
+                        ProductAddVariantAction.builder()
+                                .prices(Collections
+                                        .singletonList(new com.commercetools.api.models.common.PriceDraftImpl())) },
+                new Object[] { "images", ProductAddVariantAction.builder()
                         .images(Collections.singletonList(new com.commercetools.api.models.common.ImageImpl())) },
-                new Object[] {
+                new Object[] { "attributes",
                         ProductAddVariantAction.builder()
                                 .attributes(Collections
                                         .singletonList(new com.commercetools.api.models.product.AttributeImpl())) },
-                new Object[] { ProductAddVariantAction.builder().staged(true) },
-                new Object[] { ProductAddVariantAction.builder()
+                new Object[] { "staged", ProductAddVariantAction.builder().staged(true) },
+                new Object[] { "assets", ProductAddVariantAction.builder()
                         .assets(
                             Collections.singletonList(new com.commercetools.api.models.common.AssetDraftImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductCatalogDataTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductCatalogDataTest.java
index c32da693f88..704ef11001e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductCatalogDataTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductCatalogDataTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductCatalogDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductCatalogDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductCatalogDataBuilder builder) {
         ProductCatalogData productCatalogData = builder.buildUnchecked();
         Assertions.assertThat(productCatalogData).isInstanceOf(ProductCatalogData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductCatalogData.builder().published(true) },
-                new Object[] { ProductCatalogData.builder()
-                        .current(new com.commercetools.api.models.product.ProductDataImpl()) },
-                new Object[] { ProductCatalogData.builder()
-                        .staged(new com.commercetools.api.models.product.ProductDataImpl()) },
-                new Object[] { ProductCatalogData.builder().hasStagedChanges(true) } };
+        return new Object[][] { new Object[] { "published", ProductCatalogData.builder().published(true) },
+                new Object[] { "current",
+                        ProductCatalogData.builder()
+                                .current(new com.commercetools.api.models.product.ProductDataImpl()) },
+                new Object[] { "staged",
+                        ProductCatalogData.builder()
+                                .staged(new com.commercetools.api.models.product.ProductDataImpl()) },
+                new Object[] { "hasStagedChanges", ProductCatalogData.builder().hasStagedChanges(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeAssetNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeAssetNameActionTest.java
index ea3f4951d9a..ab553f8ea30 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeAssetNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeAssetNameActionTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductChangeAssetNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductChangeAssetNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductChangeAssetNameActionBuilder builder) {
         ProductChangeAssetNameAction productChangeAssetNameAction = builder.buildUnchecked();
         Assertions.assertThat(productChangeAssetNameAction).isInstanceOf(ProductChangeAssetNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductChangeAssetNameAction.builder().variantId(5L) },
-                new Object[] { ProductChangeAssetNameAction.builder().sku("sku") },
-                new Object[] { ProductChangeAssetNameAction.builder().staged(true) },
-                new Object[] { ProductChangeAssetNameAction.builder().assetId("assetId") },
-                new Object[] { ProductChangeAssetNameAction.builder().assetKey("assetKey") },
-                new Object[] { ProductChangeAssetNameAction.builder()
+        return new Object[][] { new Object[] { "variantId", ProductChangeAssetNameAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductChangeAssetNameAction.builder().sku("sku") },
+                new Object[] { "staged", ProductChangeAssetNameAction.builder().staged(true) },
+                new Object[] { "assetId", ProductChangeAssetNameAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductChangeAssetNameAction.builder().assetKey("assetKey") },
+                new Object[] { "name", ProductChangeAssetNameAction.builder()
                         .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeAssetOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeAssetOrderActionTest.java
index 744a9ff27fa..41de9671ccb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeAssetOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeAssetOrderActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductChangeAssetOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductChangeAssetOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductChangeAssetOrderActionBuilder builder) {
         ProductChangeAssetOrderAction productChangeAssetOrderAction = builder.buildUnchecked();
         Assertions.assertThat(productChangeAssetOrderAction).isInstanceOf(ProductChangeAssetOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductChangeAssetOrderAction.builder().variantId(5L) },
-                new Object[] { ProductChangeAssetOrderAction.builder().sku("sku") },
-                new Object[] { ProductChangeAssetOrderAction.builder().staged(true) }, new Object[] {
+        return new Object[][] { new Object[] { "variantId", ProductChangeAssetOrderAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductChangeAssetOrderAction.builder().sku("sku") },
+                new Object[] { "staged", ProductChangeAssetOrderAction.builder().staged(true) },
+                new Object[] { "assetOrder",
                         ProductChangeAssetOrderAction.builder().assetOrder(Collections.singletonList("assetOrder")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeMasterVariantActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeMasterVariantActionTest.java
index bd7c4a24c6b..49b81d0903d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeMasterVariantActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeMasterVariantActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductChangeMasterVariantActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductChangeMasterVariantActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductChangeMasterVariantActionBuilder builder) {
         ProductChangeMasterVariantAction productChangeMasterVariantAction = builder.buildUnchecked();
         Assertions.assertThat(productChangeMasterVariantAction).isInstanceOf(ProductChangeMasterVariantAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductChangeMasterVariantAction.builder().variantId(5L) },
-                new Object[] { ProductChangeMasterVariantAction.builder().sku("sku") },
-                new Object[] { ProductChangeMasterVariantAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductChangeMasterVariantAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductChangeMasterVariantAction.builder().sku("sku") },
+                new Object[] { "staged", ProductChangeMasterVariantAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeNameActionTest.java
index 6dd9dfa1a05..d0b37d20279 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeNameActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductChangeNameActionBuilder builder) {
         ProductChangeNameAction productChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(productChangeNameAction).isInstanceOf(ProductChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductChangeNameAction.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductChangeNameAction.builder().staged(true) } };
+                new Object[] { "name",
+                        ProductChangeNameAction.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductChangeNameAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangePriceActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangePriceActionTest.java
index af1fa124107..2e13938dc29 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangePriceActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangePriceActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductChangePriceActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductChangePriceActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductChangePriceActionBuilder builder) {
         ProductChangePriceAction productChangePriceAction = builder.buildUnchecked();
         Assertions.assertThat(productChangePriceAction).isInstanceOf(ProductChangePriceAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductChangePriceAction.builder().priceId("priceId") },
-                new Object[] { ProductChangePriceAction.builder()
-                        .price(new com.commercetools.api.models.common.PriceDraftImpl()) },
-                new Object[] { ProductChangePriceAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "priceId", ProductChangePriceAction.builder().priceId("priceId") },
+                new Object[] { "price",
+                        ProductChangePriceAction.builder()
+                                .price(new com.commercetools.api.models.common.PriceDraftImpl()) },
+                new Object[] { "staged", ProductChangePriceAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeSlugActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeSlugActionTest.java
index 0a82d24ab9d..d098ee917f9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeSlugActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductChangeSlugActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductChangeSlugActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductChangeSlugActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductChangeSlugActionBuilder builder) {
         ProductChangeSlugAction productChangeSlugAction = builder.buildUnchecked();
         Assertions.assertThat(productChangeSlugAction).isInstanceOf(ProductChangeSlugAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductChangeSlugAction.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductChangeSlugAction.builder().staged(true) } };
+                new Object[] { "slug",
+                        ProductChangeSlugAction.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductChangeSlugAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductDataTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductDataTest.java
index 74028aa10a3..39fb4ed79cd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductDataTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductDataTest.java
@@ -3,54 +3,52 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDataBuilder builder) {
         ProductData productData = builder.buildUnchecked();
         Assertions.assertThat(productData).isInstanceOf(ProductData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "name",
                         ProductData.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductData.builder()
-                        .categories(Collections
-                                .singletonList(new com.commercetools.api.models.category.CategoryReferenceImpl())) },
-                new Object[] { ProductData.builder()
+                new Object[] { "categories",
+                        ProductData.builder()
+                                .categories(Collections.singletonList(
+                                    new com.commercetools.api.models.category.CategoryReferenceImpl())) },
+                new Object[] { "categoryOrderHints", ProductData.builder()
                         .categoryOrderHints(new com.commercetools.api.models.product.CategoryOrderHintsImpl()) },
-                new Object[] { ProductData.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+                new Object[] { "description",
+                        ProductData.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "slug",
                         ProductData.builder().slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductData.builder()
-                        .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductData.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductData.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductData.builder()
-                        .masterVariant(new com.commercetools.api.models.product.ProductVariantImpl()) },
-                new Object[] {
+                new Object[] { "metaTitle",
+                        ProductData.builder()
+                                .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        ProductData.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        ProductData.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "masterVariant",
+                        ProductData.builder()
+                                .masterVariant(new com.commercetools.api.models.product.ProductVariantImpl()) },
+                new Object[] { "variants",
                         ProductData.builder()
                                 .variants(Collections.singletonList(
                                     new com.commercetools.api.models.product.ProductVariantImpl())) },
-                new Object[] { ProductData.builder()
+                new Object[] { "searchKeywords", ProductData.builder()
                         .searchKeywords(new com.commercetools.api.models.product.SearchKeywordsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductDraftTest.java
index c16f530761f..0f54a4cc1a3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductDraftTest.java
@@ -3,62 +3,64 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDraftBuilder builder) {
         ProductDraft productDraft = builder.buildUnchecked();
         Assertions.assertThat(productDraft).isInstanceOf(ProductDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDraft.builder()
+        return new Object[][] { new Object[] { "productType", ProductDraft.builder()
                 .productType(new com.commercetools.api.models.product_type.ProductTypeResourceIdentifierImpl()) },
-                new Object[] {
+                new Object[] { "name",
                         ProductDraft.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+                new Object[] { "slug",
                         ProductDraft.builder().slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDraft.builder().key("key") },
-                new Object[] { ProductDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDraft.builder()
-                        .categories(Collections.singletonList(
-                            new com.commercetools.api.models.category.CategoryResourceIdentifierImpl())) },
-                new Object[] { ProductDraft.builder()
+                new Object[] { "key", ProductDraft.builder().key("key") },
+                new Object[] { "description",
+                        ProductDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "categories",
+                        ProductDraft.builder()
+                                .categories(Collections.singletonList(
+                                    new com.commercetools.api.models.category.CategoryResourceIdentifierImpl())) },
+                new Object[] { "categoryOrderHints", ProductDraft.builder()
                         .categoryOrderHints(new com.commercetools.api.models.product.CategoryOrderHintsImpl()) },
-                new Object[] { ProductDraft.builder()
-                        .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDraft.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDraft.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDraft.builder()
-                        .masterVariant(new com.commercetools.api.models.product.ProductVariantDraftImpl()) },
-                new Object[] { ProductDraft.builder()
-                        .variants(Collections
-                                .singletonList(new com.commercetools.api.models.product.ProductVariantDraftImpl())) },
-                new Object[] { ProductDraft.builder()
+                new Object[] { "metaTitle",
+                        ProductDraft.builder()
+                                .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        ProductDraft.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        ProductDraft.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "masterVariant",
+                        ProductDraft.builder()
+                                .masterVariant(new com.commercetools.api.models.product.ProductVariantDraftImpl()) },
+                new Object[] { "variants",
+                        ProductDraft.builder()
+                                .variants(Collections.singletonList(
+                                    new com.commercetools.api.models.product.ProductVariantDraftImpl())) },
+                new Object[] { "taxCategory", ProductDraft.builder()
                         .taxCategory(
                             new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) },
-                new Object[] { ProductDraft.builder()
-                        .searchKeywords(new com.commercetools.api.models.product.SearchKeywordsImpl()) },
-                new Object[] { ProductDraft.builder()
-                        .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { ProductDraft.builder().publish(true) }, new Object[] { ProductDraft.builder()
+                new Object[] { "searchKeywords",
+                        ProductDraft.builder()
+                                .searchKeywords(new com.commercetools.api.models.product.SearchKeywordsImpl()) },
+                new Object[] { "state",
+                        ProductDraft.builder()
+                                .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "publish", ProductDraft.builder().publish(true) },
+                new Object[] { "priceMode", ProductDraft.builder()
                         .priceMode(com.commercetools.api.models.product.ProductPriceModeEnum.findEnum("Embedded")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductLegacySetSkuActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductLegacySetSkuActionTest.java
index 7a70f59580e..5c2a72b0cdb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductLegacySetSkuActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductLegacySetSkuActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductLegacySetSkuActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductLegacySetSkuActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductLegacySetSkuActionBuilder builder) {
         ProductLegacySetSkuAction productLegacySetSkuAction = builder.buildUnchecked();
         Assertions.assertThat(productLegacySetSkuAction).isInstanceOf(ProductLegacySetSkuAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductLegacySetSkuAction.builder().sku("sku") },
-                new Object[] { ProductLegacySetSkuAction.builder().variantId(5) } };
+        return new Object[][] { new Object[] { "sku", ProductLegacySetSkuAction.builder().sku("sku") },
+                new Object[] { "variantId", ProductLegacySetSkuAction.builder().variantId(5) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductMoveImageToPositionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductMoveImageToPositionActionTest.java
index c3ea6021d47..8863563825f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductMoveImageToPositionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductMoveImageToPositionActionTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductMoveImageToPositionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductMoveImageToPositionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductMoveImageToPositionActionBuilder builder) {
         ProductMoveImageToPositionAction productMoveImageToPositionAction = builder.buildUnchecked();
         Assertions.assertThat(productMoveImageToPositionAction).isInstanceOf(ProductMoveImageToPositionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductMoveImageToPositionAction.builder().variantId(5L) },
-                new Object[] { ProductMoveImageToPositionAction.builder().sku("sku") },
-                new Object[] { ProductMoveImageToPositionAction.builder().imageUrl("imageUrl") },
-                new Object[] { ProductMoveImageToPositionAction.builder().position(4L) },
-                new Object[] { ProductMoveImageToPositionAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductMoveImageToPositionAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductMoveImageToPositionAction.builder().sku("sku") },
+                new Object[] { "imageUrl", ProductMoveImageToPositionAction.builder().imageUrl("imageUrl") },
+                new Object[] { "position", ProductMoveImageToPositionAction.builder().position(4L) },
+                new Object[] { "staged", ProductMoveImageToPositionAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductPagedQueryResponseTest.java
index 2b5d471dad3..614e4a284a5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductPagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPagedQueryResponseBuilder builder) {
         ProductPagedQueryResponse productPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(productPagedQueryResponse).isInstanceOf(ProductPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ProductPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ProductPagedQueryResponse.builder().count(2L) },
-                new Object[] { ProductPagedQueryResponse.builder().total(1L) },
-                new Object[] { ProductPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", ProductPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ProductPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ProductPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ProductPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", ProductPagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.product.ProductImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductProjectionPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductProjectionPagedQueryResponseTest.java
index 7591da0595a..8e50b9e32f3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductProjectionPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductProjectionPagedQueryResponseTest.java
@@ -3,37 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductProjectionPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductProjectionPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductProjectionPagedQueryResponseBuilder builder) {
         ProductProjectionPagedQueryResponse productProjectionPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(productProjectionPagedQueryResponse)
                 .isInstanceOf(ProductProjectionPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductProjectionPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ProductProjectionPagedQueryResponse.builder().count(2L) },
-                new Object[] { ProductProjectionPagedQueryResponse.builder().total(1L) },
-                new Object[] { ProductProjectionPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ProductProjectionPagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.product.ProductProjectionImpl())) } };
+        return new Object[][] { new Object[] { "limit", ProductProjectionPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "count", ProductProjectionPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ProductProjectionPagedQueryResponse.builder().total(1L) },
+                new Object[] { "offset", ProductProjectionPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "results",
+                        ProductProjectionPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.product.ProductProjectionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductProjectionPagedSearchResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductProjectionPagedSearchResponseTest.java
index 91cf0f53bd7..a4151a1cfcd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductProjectionPagedSearchResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductProjectionPagedSearchResponseTest.java
@@ -3,38 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductProjectionPagedSearchResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductProjectionPagedSearchResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductProjectionPagedSearchResponseBuilder builder) {
         ProductProjectionPagedSearchResponse productProjectionPagedSearchResponse = builder.buildUnchecked();
         Assertions.assertThat(productProjectionPagedSearchResponse)
                 .isInstanceOf(ProductProjectionPagedSearchResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductProjectionPagedSearchResponse.builder().limit(7L) },
-                new Object[] { ProductProjectionPagedSearchResponse.builder().offset(3L) },
-                new Object[] { ProductProjectionPagedSearchResponse.builder().count(2L) },
-                new Object[] { ProductProjectionPagedSearchResponse.builder().total(1L) },
-                new Object[] { ProductProjectionPagedSearchResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.product.ProductProjectionImpl())) },
-                new Object[] { ProductProjectionPagedSearchResponse.builder()
+        return new Object[][] { new Object[] { "limit", ProductProjectionPagedSearchResponse.builder().limit(7L) },
+                new Object[] { "offset", ProductProjectionPagedSearchResponse.builder().offset(3L) },
+                new Object[] { "count", ProductProjectionPagedSearchResponse.builder().count(2L) },
+                new Object[] { "total", ProductProjectionPagedSearchResponse.builder().total(1L) },
+                new Object[] { "results",
+                        ProductProjectionPagedSearchResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.product.ProductProjectionImpl())) },
+                new Object[] { "facets", ProductProjectionPagedSearchResponse.builder()
                         .facets(new com.commercetools.api.models.product.FacetResultsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductProjectionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductProjectionTest.java
index 8116efc17b8..ab81ad6aa5d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductProjectionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductProjectionTest.java
@@ -4,70 +4,74 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductProjectionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductProjectionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductProjectionBuilder builder) {
         ProductProjection productProjection = builder.buildUnchecked();
         Assertions.assertThat(productProjection).isInstanceOf(ProductProjection.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductProjection.builder().id("id") },
-                new Object[] { ProductProjection.builder().version(2L) },
-                new Object[] { ProductProjection.builder().key("key") },
-                new Object[] { ProductProjection.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductProjection.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductProjection.builder()
+        return new Object[][] { new Object[] { "id", ProductProjection.builder().id("id") },
+                new Object[] { "version", ProductProjection.builder().version(2L) },
+                new Object[] { "key", ProductProjection.builder().key("key") },
+                new Object[] { "createdAt",
+                        ProductProjection.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        ProductProjection.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "productType", ProductProjection.builder()
                         .productType(new com.commercetools.api.models.product_type.ProductTypeReferenceImpl()) },
-                new Object[] { ProductProjection.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductProjection.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductProjection.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductProjection.builder()
-                        .categories(Collections
-                                .singletonList(new com.commercetools.api.models.category.CategoryReferenceImpl())) },
-                new Object[] { ProductProjection.builder()
+                new Object[] { "name",
+                        ProductProjection.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
+                        ProductProjection.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "slug",
+                        ProductProjection.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "categories",
+                        ProductProjection.builder()
+                                .categories(Collections.singletonList(
+                                    new com.commercetools.api.models.category.CategoryReferenceImpl())) },
+                new Object[] { "categoryOrderHints", ProductProjection.builder()
                         .categoryOrderHints(new com.commercetools.api.models.product.CategoryOrderHintsImpl()) },
-                new Object[] { ProductProjection.builder()
-                        .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductProjection.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductProjection.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductProjection.builder()
-                        .searchKeywords(new com.commercetools.api.models.product.SearchKeywordsImpl()) },
-                new Object[] { ProductProjection.builder().hasStagedChanges(true) },
-                new Object[] { ProductProjection.builder().published(true) },
-                new Object[] { ProductProjection.builder()
-                        .masterVariant(new com.commercetools.api.models.product.ProductVariantImpl()) },
-                new Object[] {
+                new Object[] { "metaTitle",
+                        ProductProjection.builder()
+                                .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        ProductProjection.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        ProductProjection.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "searchKeywords",
+                        ProductProjection.builder()
+                                .searchKeywords(new com.commercetools.api.models.product.SearchKeywordsImpl()) },
+                new Object[] { "hasStagedChanges", ProductProjection.builder().hasStagedChanges(true) },
+                new Object[] { "published", ProductProjection.builder().published(true) },
+                new Object[] { "masterVariant",
+                        ProductProjection.builder()
+                                .masterVariant(new com.commercetools.api.models.product.ProductVariantImpl()) },
+                new Object[] { "variants",
                         ProductProjection.builder()
                                 .variants(Collections.singletonList(
                                     new com.commercetools.api.models.product.ProductVariantImpl())) },
-                new Object[] { ProductProjection.builder()
+                new Object[] { "taxCategory", ProductProjection.builder()
                         .taxCategory(new com.commercetools.api.models.tax_category.TaxCategoryReferenceImpl()) },
-                new Object[] { ProductProjection.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { ProductProjection.builder()
+                new Object[] { "state",
+                        ProductProjection.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "reviewRatingStatistics", ProductProjection.builder()
                         .reviewRatingStatistics(new com.commercetools.api.models.review.ReviewRatingStatisticsImpl()) },
-                new Object[] { ProductProjection.builder()
+                new Object[] { "priceMode", ProductProjection.builder()
                         .priceMode(com.commercetools.api.models.product.ProductPriceModeEnum.findEnum("Embedded")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductPublishActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductPublishActionTest.java
index 372d20110ed..2505fa4c891 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductPublishActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductPublishActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPublishActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPublishActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPublishActionBuilder builder) {
         ProductPublishAction productPublishAction = builder.buildUnchecked();
         Assertions.assertThat(productPublishAction).isInstanceOf(ProductPublishAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPublishAction.builder()
+        return new Object[][] { new Object[] { "scope", ProductPublishAction.builder()
                 .scope(com.commercetools.api.models.cart.ProductPublishScope.findEnum("All")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductReferenceTest.java
index 9fb4b888bdd..95f5349b2b4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductReferenceTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductReferenceBuilder builder) {
         ProductReference productReference = builder.buildUnchecked();
         Assertions.assertThat(productReference).isInstanceOf(ProductReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductReference.builder().obj(new com.commercetools.api.models.product.ProductImpl()) },
-                new Object[] { ProductReference.builder().id("id") } };
+                new Object[] { "obj",
+                        ProductReference.builder().obj(new com.commercetools.api.models.product.ProductImpl()) },
+                new Object[] { "id", ProductReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveAssetActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveAssetActionTest.java
index bb18ee3d8e2..29ab05d3019 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveAssetActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveAssetActionTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductRemoveAssetActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductRemoveAssetActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductRemoveAssetActionBuilder builder) {
         ProductRemoveAssetAction productRemoveAssetAction = builder.buildUnchecked();
         Assertions.assertThat(productRemoveAssetAction).isInstanceOf(ProductRemoveAssetAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductRemoveAssetAction.builder().variantId(5L) },
-                new Object[] { ProductRemoveAssetAction.builder().sku("sku") },
-                new Object[] { ProductRemoveAssetAction.builder().staged(true) },
-                new Object[] { ProductRemoveAssetAction.builder().assetId("assetId") },
-                new Object[] { ProductRemoveAssetAction.builder().assetKey("assetKey") } };
+        return new Object[][] { new Object[] { "variantId", ProductRemoveAssetAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductRemoveAssetAction.builder().sku("sku") },
+                new Object[] { "staged", ProductRemoveAssetAction.builder().staged(true) },
+                new Object[] { "assetId", ProductRemoveAssetAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductRemoveAssetAction.builder().assetKey("assetKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveFromCategoryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveFromCategoryActionTest.java
index 4cf55f85b18..082e5ed03dd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveFromCategoryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveFromCategoryActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductRemoveFromCategoryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductRemoveFromCategoryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductRemoveFromCategoryActionBuilder builder) {
         ProductRemoveFromCategoryAction productRemoveFromCategoryAction = builder.buildUnchecked();
         Assertions.assertThat(productRemoveFromCategoryAction).isInstanceOf(ProductRemoveFromCategoryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductRemoveFromCategoryAction.builder()
-                        .category(new com.commercetools.api.models.category.CategoryResourceIdentifierImpl()) },
-                new Object[] { ProductRemoveFromCategoryAction.builder().staged(true) } };
+                new Object[] { "category",
+                        ProductRemoveFromCategoryAction.builder()
+                                .category(new com.commercetools.api.models.category.CategoryResourceIdentifierImpl()) },
+                new Object[] { "staged", ProductRemoveFromCategoryAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveImageActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveImageActionTest.java
index 7294c3e5e26..fef97760748 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveImageActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveImageActionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductRemoveImageActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductRemoveImageActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductRemoveImageActionBuilder builder) {
         ProductRemoveImageAction productRemoveImageAction = builder.buildUnchecked();
         Assertions.assertThat(productRemoveImageAction).isInstanceOf(ProductRemoveImageAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductRemoveImageAction.builder().variantId(5L) },
-                new Object[] { ProductRemoveImageAction.builder().sku("sku") },
-                new Object[] { ProductRemoveImageAction.builder().imageUrl("imageUrl") },
-                new Object[] { ProductRemoveImageAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductRemoveImageAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductRemoveImageAction.builder().sku("sku") },
+                new Object[] { "imageUrl", ProductRemoveImageAction.builder().imageUrl("imageUrl") },
+                new Object[] { "staged", ProductRemoveImageAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemovePriceActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemovePriceActionTest.java
index 44ba13d7bf5..c65fcf6145a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemovePriceActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemovePriceActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductRemovePriceActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductRemovePriceActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductRemovePriceActionBuilder builder) {
         ProductRemovePriceAction productRemovePriceAction = builder.buildUnchecked();
         Assertions.assertThat(productRemovePriceAction).isInstanceOf(ProductRemovePriceAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductRemovePriceAction.builder().priceId("priceId") },
-                new Object[] { ProductRemovePriceAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "priceId", ProductRemovePriceAction.builder().priceId("priceId") },
+                new Object[] { "staged", ProductRemovePriceAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveVariantActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveVariantActionTest.java
index 9185372f7af..d5250ca925c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveVariantActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRemoveVariantActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductRemoveVariantActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductRemoveVariantActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductRemoveVariantActionBuilder builder) {
         ProductRemoveVariantAction productRemoveVariantAction = builder.buildUnchecked();
         Assertions.assertThat(productRemoveVariantAction).isInstanceOf(ProductRemoveVariantAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductRemoveVariantAction.builder().id(2L) },
-                new Object[] { ProductRemoveVariantAction.builder().sku("sku") },
-                new Object[] { ProductRemoveVariantAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "id", ProductRemoveVariantAction.builder().id(2L) },
+                new Object[] { "sku", ProductRemoveVariantAction.builder().sku("sku") },
+                new Object[] { "staged", ProductRemoveVariantAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductResourceIdentifierTest.java
index bf458f140e4..d9fd6d97d16 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductResourceIdentifierBuilder builder) {
         ProductResourceIdentifier productResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(productResourceIdentifier).isInstanceOf(ProductResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductResourceIdentifier.builder().id("id") },
-                new Object[] { ProductResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", ProductResourceIdentifier.builder().id("id") },
+                new Object[] { "key", ProductResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRevertStagedChangesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRevertStagedChangesActionTest.java
index f1acc1ca23b..d4cf9f6966c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRevertStagedChangesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRevertStagedChangesActionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductRevertStagedChangesActionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRevertStagedVariantChangesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRevertStagedVariantChangesActionTest.java
index 4cc55ff2155..c6ba7722888 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRevertStagedVariantChangesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductRevertStagedVariantChangesActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductRevertStagedVariantChangesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductRevertStagedVariantChangesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductRevertStagedVariantChangesActionBuilder builder) {
         ProductRevertStagedVariantChangesAction productRevertStagedVariantChangesAction = builder.buildUnchecked();
         Assertions.assertThat(productRevertStagedVariantChangesAction)
                 .isInstanceOf(ProductRevertStagedVariantChangesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductRevertStagedVariantChangesAction.builder().variantId(5L) } };
+        return new Object[][] {
+                new Object[] { "variantId", ProductRevertStagedVariantChangesAction.builder().variantId(5L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetCustomFieldActionTest.java
index 8ff20d69764..44f0c3fd370 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetCustomFieldActionTest.java
@@ -1,36 +1,28 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetAssetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetAssetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetAssetCustomFieldActionBuilder builder) {
         ProductSetAssetCustomFieldAction productSetAssetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(productSetAssetCustomFieldAction).isInstanceOf(ProductSetAssetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetAssetCustomFieldAction.builder().variantId(5L) },
-                new Object[] { ProductSetAssetCustomFieldAction.builder().sku("sku") },
-                new Object[] { ProductSetAssetCustomFieldAction.builder().staged(true) },
-                new Object[] { ProductSetAssetCustomFieldAction.builder().assetId("assetId") },
-                new Object[] { ProductSetAssetCustomFieldAction.builder().assetKey("assetKey") },
-                new Object[] { ProductSetAssetCustomFieldAction.builder().name("name") },
-                new Object[] { ProductSetAssetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "variantId", ProductSetAssetCustomFieldAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductSetAssetCustomFieldAction.builder().sku("sku") },
+                new Object[] { "staged", ProductSetAssetCustomFieldAction.builder().staged(true) },
+                new Object[] { "assetId", ProductSetAssetCustomFieldAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductSetAssetCustomFieldAction.builder().assetKey("assetKey") },
+                new Object[] { "name", ProductSetAssetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ProductSetAssetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetCustomTypeActionTest.java
index a4821d67941..6d9ac22b4df 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetCustomTypeActionTest.java
@@ -1,37 +1,30 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetAssetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetAssetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetAssetCustomTypeActionBuilder builder) {
         ProductSetAssetCustomTypeAction productSetAssetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(productSetAssetCustomTypeAction).isInstanceOf(ProductSetAssetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetAssetCustomTypeAction.builder().variantId(5L) },
-                new Object[] { ProductSetAssetCustomTypeAction.builder().sku("sku") },
-                new Object[] { ProductSetAssetCustomTypeAction.builder().staged(true) },
-                new Object[] { ProductSetAssetCustomTypeAction.builder().assetId("assetId") },
-                new Object[] { ProductSetAssetCustomTypeAction.builder().assetKey("assetKey") },
-                new Object[] { ProductSetAssetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ProductSetAssetCustomTypeAction.builder()
+        return new Object[][] { new Object[] { "variantId", ProductSetAssetCustomTypeAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductSetAssetCustomTypeAction.builder().sku("sku") },
+                new Object[] { "staged", ProductSetAssetCustomTypeAction.builder().staged(true) },
+                new Object[] { "assetId", ProductSetAssetCustomTypeAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductSetAssetCustomTypeAction.builder().assetKey("assetKey") },
+                new Object[] { "type",
+                        ProductSetAssetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ProductSetAssetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetDescriptionActionTest.java
index b1e55b5851b..9f4e8f89c17 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetDescriptionActionTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetAssetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetAssetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetAssetDescriptionActionBuilder builder) {
         ProductSetAssetDescriptionAction productSetAssetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(productSetAssetDescriptionAction).isInstanceOf(ProductSetAssetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetAssetDescriptionAction.builder().variantId(5L) },
-                new Object[] { ProductSetAssetDescriptionAction.builder().sku("sku") },
-                new Object[] { ProductSetAssetDescriptionAction.builder().staged(true) },
-                new Object[] { ProductSetAssetDescriptionAction.builder().assetId("assetId") },
-                new Object[] { ProductSetAssetDescriptionAction.builder().assetKey("assetKey") },
-                new Object[] { ProductSetAssetDescriptionAction.builder()
+        return new Object[][] { new Object[] { "variantId", ProductSetAssetDescriptionAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductSetAssetDescriptionAction.builder().sku("sku") },
+                new Object[] { "staged", ProductSetAssetDescriptionAction.builder().staged(true) },
+                new Object[] { "assetId", ProductSetAssetDescriptionAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductSetAssetDescriptionAction.builder().assetKey("assetKey") },
+                new Object[] { "description", ProductSetAssetDescriptionAction.builder()
                         .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetKeyActionTest.java
index 15df3dfaf92..0c9ac47f011 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetKeyActionTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetAssetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetAssetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetAssetKeyActionBuilder builder) {
         ProductSetAssetKeyAction productSetAssetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(productSetAssetKeyAction).isInstanceOf(ProductSetAssetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetAssetKeyAction.builder().variantId(5L) },
-                new Object[] { ProductSetAssetKeyAction.builder().sku("sku") },
-                new Object[] { ProductSetAssetKeyAction.builder().staged(true) },
-                new Object[] { ProductSetAssetKeyAction.builder().assetId("assetId") },
-                new Object[] { ProductSetAssetKeyAction.builder().assetKey("assetKey") } };
+        return new Object[][] { new Object[] { "variantId", ProductSetAssetKeyAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductSetAssetKeyAction.builder().sku("sku") },
+                new Object[] { "staged", ProductSetAssetKeyAction.builder().staged(true) },
+                new Object[] { "assetId", ProductSetAssetKeyAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductSetAssetKeyAction.builder().assetKey("assetKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetSourcesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetSourcesActionTest.java
index 05d920c2960..7c5d2999ea8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetSourcesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetSourcesActionTest.java
@@ -3,35 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetAssetSourcesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetAssetSourcesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetAssetSourcesActionBuilder builder) {
         ProductSetAssetSourcesAction productSetAssetSourcesAction = builder.buildUnchecked();
         Assertions.assertThat(productSetAssetSourcesAction).isInstanceOf(ProductSetAssetSourcesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetAssetSourcesAction.builder().variantId(5L) },
-                new Object[] { ProductSetAssetSourcesAction.builder().sku("sku") },
-                new Object[] { ProductSetAssetSourcesAction.builder().staged(true) },
-                new Object[] { ProductSetAssetSourcesAction.builder().assetId("assetId") },
-                new Object[] { ProductSetAssetSourcesAction.builder().assetKey("assetKey") },
-                new Object[] { ProductSetAssetSourcesAction.builder()
+        return new Object[][] { new Object[] { "variantId", ProductSetAssetSourcesAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductSetAssetSourcesAction.builder().sku("sku") },
+                new Object[] { "staged", ProductSetAssetSourcesAction.builder().staged(true) },
+                new Object[] { "assetId", ProductSetAssetSourcesAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductSetAssetSourcesAction.builder().assetKey("assetKey") },
+                new Object[] { "sources", ProductSetAssetSourcesAction.builder()
                         .sources(
                             Collections.singletonList(new com.commercetools.api.models.common.AssetSourceImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetTagsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetTagsActionTest.java
index 6a38a4b1002..b1f3aec1e45 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetTagsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAssetTagsActionTest.java
@@ -3,35 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetAssetTagsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetAssetTagsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetAssetTagsActionBuilder builder) {
         ProductSetAssetTagsAction productSetAssetTagsAction = builder.buildUnchecked();
         Assertions.assertThat(productSetAssetTagsAction).isInstanceOf(ProductSetAssetTagsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetAssetTagsAction.builder().variantId(5L) },
-                new Object[] { ProductSetAssetTagsAction.builder().sku("sku") },
-                new Object[] { ProductSetAssetTagsAction.builder().staged(true) },
-                new Object[] { ProductSetAssetTagsAction.builder().assetId("assetId") },
-                new Object[] { ProductSetAssetTagsAction.builder().assetKey("assetKey") },
-                new Object[] { ProductSetAssetTagsAction.builder().tags(Collections.singletonList("tags")) } };
+        return new Object[][] { new Object[] { "variantId", ProductSetAssetTagsAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductSetAssetTagsAction.builder().sku("sku") },
+                new Object[] { "staged", ProductSetAssetTagsAction.builder().staged(true) },
+                new Object[] { "assetId", ProductSetAssetTagsAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductSetAssetTagsAction.builder().assetKey("assetKey") },
+                new Object[] { "tags", ProductSetAssetTagsAction.builder().tags(Collections.singletonList("tags")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAttributeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAttributeActionTest.java
index d5dc64fe4f1..14e430afe9b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAttributeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAttributeActionTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetAttributeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetAttributeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetAttributeActionBuilder builder) {
         ProductSetAttributeAction productSetAttributeAction = builder.buildUnchecked();
         Assertions.assertThat(productSetAttributeAction).isInstanceOf(ProductSetAttributeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetAttributeAction.builder().variantId(5L) },
-                new Object[] { ProductSetAttributeAction.builder().sku("sku") },
-                new Object[] { ProductSetAttributeAction.builder().name("name") },
-                new Object[] { ProductSetAttributeAction.builder().value("value") },
-                new Object[] { ProductSetAttributeAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductSetAttributeAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductSetAttributeAction.builder().sku("sku") },
+                new Object[] { "name", ProductSetAttributeAction.builder().name("name") },
+                new Object[] { "value", ProductSetAttributeAction.builder().value("value") },
+                new Object[] { "staged", ProductSetAttributeAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAttributeInAllVariantsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAttributeInAllVariantsActionTest.java
index 2ac1f71c00e..648cbd9021b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAttributeInAllVariantsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetAttributeInAllVariantsActionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetAttributeInAllVariantsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetAttributeInAllVariantsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetAttributeInAllVariantsActionBuilder builder) {
         ProductSetAttributeInAllVariantsAction productSetAttributeInAllVariantsAction = builder.buildUnchecked();
         Assertions.assertThat(productSetAttributeInAllVariantsAction)
                 .isInstanceOf(ProductSetAttributeInAllVariantsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetAttributeInAllVariantsAction.builder().name("name") },
-                new Object[] { ProductSetAttributeInAllVariantsAction.builder().value("value") },
-                new Object[] { ProductSetAttributeInAllVariantsAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "name", ProductSetAttributeInAllVariantsAction.builder().name("name") },
+                new Object[] { "value", ProductSetAttributeInAllVariantsAction.builder().value("value") },
+                new Object[] { "staged", ProductSetAttributeInAllVariantsAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetCategoryOrderHintActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetCategoryOrderHintActionTest.java
index 0afc88adef3..6c8b029f363 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetCategoryOrderHintActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetCategoryOrderHintActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetCategoryOrderHintActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetCategoryOrderHintActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetCategoryOrderHintActionBuilder builder) {
         ProductSetCategoryOrderHintAction productSetCategoryOrderHintAction = builder.buildUnchecked();
         Assertions.assertThat(productSetCategoryOrderHintAction).isInstanceOf(ProductSetCategoryOrderHintAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetCategoryOrderHintAction.builder().categoryId("categoryId") },
-                new Object[] { ProductSetCategoryOrderHintAction.builder().orderHint("orderHint") },
-                new Object[] { ProductSetCategoryOrderHintAction.builder().staged(true) } };
+        return new Object[][] {
+                new Object[] { "categoryId", ProductSetCategoryOrderHintAction.builder().categoryId("categoryId") },
+                new Object[] { "orderHint", ProductSetCategoryOrderHintAction.builder().orderHint("orderHint") },
+                new Object[] { "staged", ProductSetCategoryOrderHintAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetDescriptionActionTest.java
index 4772c930187..107aac03390 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetDescriptionActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetDescriptionActionBuilder builder) {
         ProductSetDescriptionAction productSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(productSetDescriptionAction).isInstanceOf(ProductSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSetDescriptionAction.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductSetDescriptionAction.builder().staged(true) } };
+                new Object[] { "description",
+                        ProductSetDescriptionAction.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductSetDescriptionAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetDiscountedPriceActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetDiscountedPriceActionTest.java
index 5e8500a5d96..446eb723828 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetDiscountedPriceActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetDiscountedPriceActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetDiscountedPriceActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetDiscountedPriceActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetDiscountedPriceActionBuilder builder) {
         ProductSetDiscountedPriceAction productSetDiscountedPriceAction = builder.buildUnchecked();
         Assertions.assertThat(productSetDiscountedPriceAction).isInstanceOf(ProductSetDiscountedPriceAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetDiscountedPriceAction.builder().priceId("priceId") },
-                new Object[] { ProductSetDiscountedPriceAction.builder().staged(true) },
-                new Object[] { ProductSetDiscountedPriceAction.builder()
+        return new Object[][] {
+                new Object[] { "priceId", ProductSetDiscountedPriceAction.builder().priceId("priceId") },
+                new Object[] { "staged", ProductSetDiscountedPriceAction.builder().staged(true) },
+                new Object[] { "discounted", ProductSetDiscountedPriceAction.builder()
                         .discounted(new com.commercetools.api.models.common.DiscountedPriceDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetImageLabelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetImageLabelActionTest.java
index bf17d7e9f0a..90a3914ab5c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetImageLabelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetImageLabelActionTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetImageLabelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetImageLabelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetImageLabelActionBuilder builder) {
         ProductSetImageLabelAction productSetImageLabelAction = builder.buildUnchecked();
         Assertions.assertThat(productSetImageLabelAction).isInstanceOf(ProductSetImageLabelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetImageLabelAction.builder().sku("sku") },
-                new Object[] { ProductSetImageLabelAction.builder().variantId(5L) },
-                new Object[] { ProductSetImageLabelAction.builder().imageUrl("imageUrl") },
-                new Object[] { ProductSetImageLabelAction.builder().label("label") },
-                new Object[] { ProductSetImageLabelAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "sku", ProductSetImageLabelAction.builder().sku("sku") },
+                new Object[] { "variantId", ProductSetImageLabelAction.builder().variantId(5L) },
+                new Object[] { "imageUrl", ProductSetImageLabelAction.builder().imageUrl("imageUrl") },
+                new Object[] { "label", ProductSetImageLabelAction.builder().label("label") },
+                new Object[] { "staged", ProductSetImageLabelAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetKeyActionTest.java
index d5e154de69d..47b343d5bb7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetKeyActionBuilder builder) {
         ProductSetKeyAction productSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(productSetKeyAction).isInstanceOf(ProductSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ProductSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetMetaDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetMetaDescriptionActionTest.java
index 08dc1e8f19a..413fbe1344f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetMetaDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetMetaDescriptionActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetMetaDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetMetaDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetMetaDescriptionActionBuilder builder) {
         ProductSetMetaDescriptionAction productSetMetaDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(productSetMetaDescriptionAction).isInstanceOf(ProductSetMetaDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSetMetaDescriptionAction.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductSetMetaDescriptionAction.builder().staged(true) } };
+                new Object[] { "metaDescription",
+                        ProductSetMetaDescriptionAction.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductSetMetaDescriptionAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetMetaKeywordsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetMetaKeywordsActionTest.java
index 85ecd6e85b4..00e4a30c334 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetMetaKeywordsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetMetaKeywordsActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetMetaKeywordsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetMetaKeywordsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetMetaKeywordsActionBuilder builder) {
         ProductSetMetaKeywordsAction productSetMetaKeywordsAction = builder.buildUnchecked();
         Assertions.assertThat(productSetMetaKeywordsAction).isInstanceOf(ProductSetMetaKeywordsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSetMetaKeywordsAction.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductSetMetaKeywordsAction.builder().staged(true) } };
+                new Object[] { "metaKeywords",
+                        ProductSetMetaKeywordsAction.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductSetMetaKeywordsAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetMetaTitleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetMetaTitleActionTest.java
index fa04e7e7c20..68e3487d78d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetMetaTitleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetMetaTitleActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetMetaTitleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetMetaTitleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetMetaTitleActionBuilder builder) {
         ProductSetMetaTitleAction productSetMetaTitleAction = builder.buildUnchecked();
         Assertions.assertThat(productSetMetaTitleAction).isInstanceOf(ProductSetMetaTitleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSetMetaTitleAction.builder()
-                        .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductSetMetaTitleAction.builder().staged(true) } };
+                new Object[] { "metaTitle",
+                        ProductSetMetaTitleAction.builder()
+                                .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductSetMetaTitleAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetPriceKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetPriceKeyActionTest.java
index 6c890758702..39e6898c1e4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetPriceKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetPriceKeyActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetPriceKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetPriceKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetPriceKeyActionBuilder builder) {
         ProductSetPriceKeyAction productSetPriceKeyAction = builder.buildUnchecked();
         Assertions.assertThat(productSetPriceKeyAction).isInstanceOf(ProductSetPriceKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetPriceKeyAction.builder().priceId("priceId") },
-                new Object[] { ProductSetPriceKeyAction.builder().staged(true) },
-                new Object[] { ProductSetPriceKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "priceId", ProductSetPriceKeyAction.builder().priceId("priceId") },
+                new Object[] { "staged", ProductSetPriceKeyAction.builder().staged(true) },
+                new Object[] { "key", ProductSetPriceKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetPriceModeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetPriceModeActionTest.java
index fba3fe97ac3..5533d553aff 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetPriceModeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetPriceModeActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetPriceModeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetPriceModeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetPriceModeActionBuilder builder) {
         ProductSetPriceModeAction productSetPriceModeAction = builder.buildUnchecked();
         Assertions.assertThat(productSetPriceModeAction).isInstanceOf(ProductSetPriceModeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetPriceModeAction.builder()
+        return new Object[][] { new Object[] { "priceMode", ProductSetPriceModeAction.builder()
                 .priceMode(com.commercetools.api.models.product.ProductPriceModeEnum.findEnum("Embedded")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetPricesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetPricesActionTest.java
index 6b0c2541a28..08e40a12d70 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetPricesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetPricesActionTest.java
@@ -3,34 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetPricesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetPricesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetPricesActionBuilder builder) {
         ProductSetPricesAction productSetPricesAction = builder.buildUnchecked();
         Assertions.assertThat(productSetPricesAction).isInstanceOf(ProductSetPricesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetPricesAction.builder().variantId(5L) },
-                new Object[] { ProductSetPricesAction.builder().sku("sku") },
-                new Object[] { ProductSetPricesAction.builder()
-                        .prices(Collections.singletonList(new com.commercetools.api.models.common.PriceDraftImpl())) },
-                new Object[] { ProductSetPricesAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductSetPricesAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductSetPricesAction.builder().sku("sku") },
+                new Object[] { "prices",
+                        ProductSetPricesAction.builder()
+                                .prices(Collections
+                                        .singletonList(new com.commercetools.api.models.common.PriceDraftImpl())) },
+                new Object[] { "staged", ProductSetPricesAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetProductPriceCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetProductPriceCustomFieldActionTest.java
index 13265f19923..97361125071 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetProductPriceCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetProductPriceCustomFieldActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetProductPriceCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetProductPriceCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetProductPriceCustomFieldActionBuilder builder) {
         ProductSetProductPriceCustomFieldAction productSetProductPriceCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(productSetProductPriceCustomFieldAction)
                 .isInstanceOf(ProductSetProductPriceCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetProductPriceCustomFieldAction.builder().priceId("priceId") },
-                new Object[] { ProductSetProductPriceCustomFieldAction.builder().staged(true) },
-                new Object[] { ProductSetProductPriceCustomFieldAction.builder().name("name") },
-                new Object[] { ProductSetProductPriceCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "priceId", ProductSetProductPriceCustomFieldAction.builder().priceId("priceId") },
+                new Object[] { "staged", ProductSetProductPriceCustomFieldAction.builder().staged(true) },
+                new Object[] { "name", ProductSetProductPriceCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ProductSetProductPriceCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetProductPriceCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetProductPriceCustomTypeActionTest.java
index 1c5cff259de..4a13002a9c9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetProductPriceCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetProductPriceCustomTypeActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetProductPriceCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetProductPriceCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetProductPriceCustomTypeActionBuilder builder) {
         ProductSetProductPriceCustomTypeAction productSetProductPriceCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(productSetProductPriceCustomTypeAction)
                 .isInstanceOf(ProductSetProductPriceCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetProductPriceCustomTypeAction.builder().priceId("priceId") },
-                new Object[] { ProductSetProductPriceCustomTypeAction.builder().staged(true) },
-                new Object[] { ProductSetProductPriceCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ProductSetProductPriceCustomTypeAction.builder()
+        return new Object[][] {
+                new Object[] { "priceId", ProductSetProductPriceCustomTypeAction.builder().priceId("priceId") },
+                new Object[] { "staged", ProductSetProductPriceCustomTypeAction.builder().staged(true) },
+                new Object[] { "type",
+                        ProductSetProductPriceCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ProductSetProductPriceCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetProductVariantKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetProductVariantKeyActionTest.java
index 59552c03046..a42716b55a4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetProductVariantKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetProductVariantKeyActionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetProductVariantKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetProductVariantKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetProductVariantKeyActionBuilder builder) {
         ProductSetProductVariantKeyAction productSetProductVariantKeyAction = builder.buildUnchecked();
         Assertions.assertThat(productSetProductVariantKeyAction).isInstanceOf(ProductSetProductVariantKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetProductVariantKeyAction.builder().variantId(5L) },
-                new Object[] { ProductSetProductVariantKeyAction.builder().sku("sku") },
-                new Object[] { ProductSetProductVariantKeyAction.builder().key("key") },
-                new Object[] { ProductSetProductVariantKeyAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductSetProductVariantKeyAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductSetProductVariantKeyAction.builder().sku("sku") },
+                new Object[] { "key", ProductSetProductVariantKeyAction.builder().key("key") },
+                new Object[] { "staged", ProductSetProductVariantKeyAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetSearchKeywordsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetSearchKeywordsActionTest.java
index b42526cb9db..de94c4a680a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetSearchKeywordsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetSearchKeywordsActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetSearchKeywordsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetSearchKeywordsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetSearchKeywordsActionBuilder builder) {
         ProductSetSearchKeywordsAction productSetSearchKeywordsAction = builder.buildUnchecked();
         Assertions.assertThat(productSetSearchKeywordsAction).isInstanceOf(ProductSetSearchKeywordsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSetSearchKeywordsAction.builder()
-                        .searchKeywords(new com.commercetools.api.models.product.SearchKeywordsImpl()) },
-                new Object[] { ProductSetSearchKeywordsAction.builder().staged(true) } };
+                new Object[] { "searchKeywords",
+                        ProductSetSearchKeywordsAction.builder()
+                                .searchKeywords(new com.commercetools.api.models.product.SearchKeywordsImpl()) },
+                new Object[] { "staged", ProductSetSearchKeywordsAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetSkuActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetSkuActionTest.java
index 1da81a1f73a..e53e7412850 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetSkuActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetSkuActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetSkuActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetSkuActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetSkuActionBuilder builder) {
         ProductSetSkuAction productSetSkuAction = builder.buildUnchecked();
         Assertions.assertThat(productSetSkuAction).isInstanceOf(ProductSetSkuAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetSkuAction.builder().variantId(5L) },
-                new Object[] { ProductSetSkuAction.builder().sku("sku") },
-                new Object[] { ProductSetSkuAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductSetSkuAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductSetSkuAction.builder().sku("sku") },
+                new Object[] { "staged", ProductSetSkuAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetTaxCategoryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetTaxCategoryActionTest.java
index 1735c06ec72..705f88e9e65 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetTaxCategoryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductSetTaxCategoryActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSetTaxCategoryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSetTaxCategoryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSetTaxCategoryActionBuilder builder) {
         ProductSetTaxCategoryAction productSetTaxCategoryAction = builder.buildUnchecked();
         Assertions.assertThat(productSetTaxCategoryAction).isInstanceOf(ProductSetTaxCategoryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSetTaxCategoryAction.builder()
+        return new Object[][] { new Object[] { "taxCategory", ProductSetTaxCategoryAction.builder()
                 .taxCategory(new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductTest.java
index bb499092336..9a10e856562 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductTest.java
@@ -4,51 +4,49 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductBuilder builder) {
         Product product = builder.buildUnchecked();
         Assertions.assertThat(product).isInstanceOf(Product.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Product.builder().id("id") },
-                new Object[] { Product.builder().version(2L) },
-                new Object[] { Product.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Product.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Product.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Product.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { Product.builder().key("key") },
-                new Object[] { Product.builder()
+        return new Object[][] { new Object[] { "id", Product.builder().id("id") },
+                new Object[] { "version", Product.builder().version(2L) },
+                new Object[] { "createdAt", Product.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Product.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        Product.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
+                        Product.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
+                new Object[] { "key", Product.builder().key("key") },
+                new Object[] { "productType", Product.builder()
                         .productType(new com.commercetools.api.models.product_type.ProductTypeReferenceImpl()) },
-                new Object[] { Product.builder()
-                        .masterData(new com.commercetools.api.models.product.ProductCatalogDataImpl()) },
-                new Object[] { Product.builder()
+                new Object[] { "masterData",
+                        Product.builder()
+                                .masterData(new com.commercetools.api.models.product.ProductCatalogDataImpl()) },
+                new Object[] { "taxCategory", Product.builder()
                         .taxCategory(new com.commercetools.api.models.tax_category.TaxCategoryReferenceImpl()) },
-                new Object[] { Product.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { Product.builder()
+                new Object[] { "state",
+                        Product.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "reviewRatingStatistics", Product.builder()
                         .reviewRatingStatistics(new com.commercetools.api.models.review.ReviewRatingStatisticsImpl()) },
-                new Object[] { Product.builder()
+                new Object[] { "priceMode", Product.builder()
                         .priceMode(com.commercetools.api.models.product.ProductPriceModeEnum.findEnum("Embedded")) },
-                new Object[] { Product.builder()
-                        .warnings(Collections
-                                .singletonList(new com.commercetools.api.models.warning.WarningObjectImpl())) } };
+                new Object[] { "warnings",
+                        Product.builder()
+                                .warnings(Collections.singletonList(
+                                    new com.commercetools.api.models.warning.WarningObjectImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductTransitionStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductTransitionStateActionTest.java
index a9be78c6bc8..2f7b2dfe3dc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductTransitionStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductTransitionStateActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTransitionStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTransitionStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTransitionStateActionBuilder builder) {
         ProductTransitionStateAction productTransitionStateAction = builder.buildUnchecked();
         Assertions.assertThat(productTransitionStateAction).isInstanceOf(ProductTransitionStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTransitionStateAction.builder()
-                        .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { ProductTransitionStateAction.builder().force(true) } };
+                new Object[] { "state",
+                        ProductTransitionStateAction.builder()
+                                .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "force", ProductTransitionStateAction.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductUnpublishActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductUnpublishActionTest.java
index 261cfaa5fa6..17fa3d78ecc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductUnpublishActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductUnpublishActionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductUnpublishActionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductUpdateTest.java
index b7fc075307d..aa9216580f6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductUpdateBuilder builder) {
         ProductUpdate productUpdate = builder.buildUnchecked();
         Assertions.assertThat(productUpdate).isInstanceOf(ProductUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductUpdate.builder().version(2L) },
-                new Object[] { ProductUpdate.builder()
-                        .actions(Collections
-                                .singletonList(new com.commercetools.api.models.product.ProductUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", ProductUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        ProductUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.product.ProductUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantAvailabilityTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantAvailabilityTest.java
index c5a28a9b436..1cb943830f8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantAvailabilityTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantAvailabilityTest.java
@@ -1,36 +1,28 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantAvailabilityTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantAvailabilityBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantAvailabilityBuilder builder) {
         ProductVariantAvailability productVariantAvailability = builder.buildUnchecked();
         Assertions.assertThat(productVariantAvailability).isInstanceOf(ProductVariantAvailability.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantAvailability.builder()
+        return new Object[][] { new Object[] { "channels", ProductVariantAvailability.builder()
                 .channels(new com.commercetools.api.models.product.ProductVariantChannelAvailabilityMapImpl()) },
-                new Object[] { ProductVariantAvailability.builder().isOnStock(true) },
-                new Object[] { ProductVariantAvailability.builder().restockableInDays(4L) },
-                new Object[] { ProductVariantAvailability.builder().availableQuantity(3L) },
-                new Object[] { ProductVariantAvailability.builder().id("id") },
-                new Object[] { ProductVariantAvailability.builder().version(2L) } };
+                new Object[] { "isOnStock", ProductVariantAvailability.builder().isOnStock(true) },
+                new Object[] { "restockableInDays", ProductVariantAvailability.builder().restockableInDays(4L) },
+                new Object[] { "availableQuantity", ProductVariantAvailability.builder().availableQuantity(3L) },
+                new Object[] { "id", ProductVariantAvailability.builder().id("id") },
+                new Object[] { "version", ProductVariantAvailability.builder().version(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantChannelAvailabilityMapTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantChannelAvailabilityMapTest.java
index d5b072b80e2..d3389e1d6a8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantChannelAvailabilityMapTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantChannelAvailabilityMapTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantChannelAvailabilityMapTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantChannelAvailabilityTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantChannelAvailabilityTest.java
index e4be473bc0e..79e16e5cf37 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantChannelAvailabilityTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantChannelAvailabilityTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantChannelAvailabilityTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantChannelAvailabilityBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantChannelAvailabilityBuilder builder) {
         ProductVariantChannelAvailability productVariantChannelAvailability = builder.buildUnchecked();
         Assertions.assertThat(productVariantChannelAvailability).isInstanceOf(ProductVariantChannelAvailability.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantChannelAvailability.builder().isOnStock(true) },
-                new Object[] { ProductVariantChannelAvailability.builder().restockableInDays(4L) },
-                new Object[] { ProductVariantChannelAvailability.builder().availableQuantity(3L) },
-                new Object[] { ProductVariantChannelAvailability.builder().id("id") },
-                new Object[] { ProductVariantChannelAvailability.builder().version(2L) } };
+        return new Object[][] {
+                new Object[] { "isOnStock", ProductVariantChannelAvailability.builder().isOnStock(true) },
+                new Object[] { "restockableInDays", ProductVariantChannelAvailability.builder().restockableInDays(4L) },
+                new Object[] { "availableQuantity", ProductVariantChannelAvailability.builder().availableQuantity(3L) },
+                new Object[] { "id", ProductVariantChannelAvailability.builder().id("id") },
+                new Object[] { "version", ProductVariantChannelAvailability.builder().version(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantDraftTest.java
index aeac7402b5c..1729cb78d6c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantDraftTest.java
@@ -3,40 +3,34 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantDraftBuilder builder) {
         ProductVariantDraft productVariantDraft = builder.buildUnchecked();
         Assertions.assertThat(productVariantDraft).isInstanceOf(ProductVariantDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantDraft.builder().sku("sku") },
-                new Object[] { ProductVariantDraft.builder().key("key") },
-                new Object[] { ProductVariantDraft.builder()
-                        .prices(Collections.singletonList(new com.commercetools.api.models.common.PriceDraftImpl())) },
-                new Object[] {
+        return new Object[][] { new Object[] { "sku", ProductVariantDraft.builder().sku("sku") },
+                new Object[] { "key", ProductVariantDraft.builder().key("key") },
+                new Object[] { "prices",
+                        ProductVariantDraft.builder()
+                                .prices(Collections
+                                        .singletonList(new com.commercetools.api.models.common.PriceDraftImpl())) },
+                new Object[] { "attributes",
                         ProductVariantDraft.builder()
                                 .attributes(Collections
                                         .singletonList(new com.commercetools.api.models.product.AttributeImpl())) },
-                new Object[] { ProductVariantDraft.builder()
+                new Object[] { "images", ProductVariantDraft.builder()
                         .images(Collections.singletonList(new com.commercetools.api.models.common.ImageImpl())) },
-                new Object[] { ProductVariantDraft.builder()
+                new Object[] { "assets", ProductVariantDraft.builder()
                         .assets(
                             Collections.singletonList(new com.commercetools.api.models.common.AssetDraftImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantTest.java
index 3bf201873e7..8128d5c3843 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/ProductVariantTest.java
@@ -3,49 +3,43 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantBuilder builder) {
         ProductVariant productVariant = builder.buildUnchecked();
         Assertions.assertThat(productVariant).isInstanceOf(ProductVariant.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariant.builder().id(2L) },
-                new Object[] { ProductVariant.builder().sku("sku") },
-                new Object[] { ProductVariant.builder().key("key") },
-                new Object[] { ProductVariant.builder()
+        return new Object[][] { new Object[] { "id", ProductVariant.builder().id(2L) },
+                new Object[] { "sku", ProductVariant.builder().sku("sku") },
+                new Object[] { "key", ProductVariant.builder().key("key") },
+                new Object[] { "prices", ProductVariant.builder()
                         .prices(Collections.singletonList(new com.commercetools.api.models.common.PriceImpl())) },
-                new Object[] {
+                new Object[] { "attributes",
                         ProductVariant.builder()
                                 .attributes(Collections
                                         .singletonList(new com.commercetools.api.models.product.AttributeImpl())) },
-                new Object[] { ProductVariant.builder().price(new com.commercetools.api.models.common.PriceImpl()) },
-                new Object[] { ProductVariant.builder()
+                new Object[] { "price",
+                        ProductVariant.builder().price(new com.commercetools.api.models.common.PriceImpl()) },
+                new Object[] { "images", ProductVariant.builder()
                         .images(Collections.singletonList(new com.commercetools.api.models.common.ImageImpl())) },
-                new Object[] { ProductVariant.builder()
+                new Object[] { "assets", ProductVariant.builder()
                         .assets(Collections.singletonList(new com.commercetools.api.models.common.AssetImpl())) },
-                new Object[] { ProductVariant.builder()
+                new Object[] { "availability", ProductVariant.builder()
                         .availability(new com.commercetools.api.models.product.ProductVariantAvailabilityImpl()) },
-                new Object[] { ProductVariant.builder().isMatchingVariant(true) },
-                new Object[] { ProductVariant.builder()
-                        .scopedPrice(new com.commercetools.api.models.common.ScopedPriceImpl()) },
-                new Object[] { ProductVariant.builder().scopedPriceDiscounted(true) } };
+                new Object[] { "isMatchingVariant", ProductVariant.builder().isMatchingVariant(true) },
+                new Object[] { "scopedPrice",
+                        ProductVariant.builder()
+                                .scopedPrice(new com.commercetools.api.models.common.ScopedPriceImpl()) },
+                new Object[] { "scopedPriceDiscounted", ProductVariant.builder().scopedPriceDiscounted(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/RangeFacetResultTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/RangeFacetResultTest.java
index 1fc370a4143..f4d69a48b3e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/RangeFacetResultTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/RangeFacetResultTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RangeFacetResultTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RangeFacetResultBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RangeFacetResultBuilder builder) {
         RangeFacetResult rangeFacetResult = builder.buildUnchecked();
         Assertions.assertThat(rangeFacetResult).isInstanceOf(RangeFacetResult.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RangeFacetResult.builder()
+        return new Object[][] { new Object[] { "ranges", RangeFacetResult.builder()
                 .ranges(Collections.singletonList(new com.commercetools.api.models.product.FacetRangeImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SearchKeywordTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SearchKeywordTest.java
index 9856ac62c84..e9e54a1412b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SearchKeywordTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SearchKeywordTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchKeywordTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchKeywordBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchKeywordBuilder builder) {
         SearchKeyword searchKeyword = builder.buildUnchecked();
         Assertions.assertThat(searchKeyword).isInstanceOf(SearchKeyword.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchKeyword.builder().text("text") },
-                new Object[] { SearchKeyword.builder()
+        return new Object[][] { new Object[] { "text", SearchKeyword.builder().text("text") },
+                new Object[] { "suggestTokenizer", SearchKeyword.builder()
                         .suggestTokenizer(new com.commercetools.api.models.product.SuggestTokenizerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SearchKeywordsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SearchKeywordsTest.java
index d747ad1701f..1162ac67cd8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SearchKeywordsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SearchKeywordsTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchKeywordsTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SuggestionResultTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SuggestionResultTest.java
index 0c8c8fd0efe..c3a4ea5f70c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SuggestionResultTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SuggestionResultTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SuggestionResultTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SuggestionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SuggestionTest.java
index ec45f4818a4..48d30c60499 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SuggestionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/SuggestionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SuggestionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SuggestionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SuggestionBuilder builder) {
         Suggestion suggestion = builder.buildUnchecked();
         Assertions.assertThat(suggestion).isInstanceOf(Suggestion.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Suggestion.builder().text("text") } };
+        return new Object[][] { new Object[] { "text", Suggestion.builder().text("text") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/TermFacetResultTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/TermFacetResultTest.java
index a98397b9395..7223fb79c67 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/TermFacetResultTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/TermFacetResultTest.java
@@ -3,35 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TermFacetResultTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TermFacetResultBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TermFacetResultBuilder builder) {
         TermFacetResult termFacetResult = builder.buildUnchecked();
         Assertions.assertThat(termFacetResult).isInstanceOf(TermFacetResult.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { TermFacetResult.builder()
-                        .dataType(com.commercetools.api.models.product.TermFacetResultType.findEnum("text")) },
-                new Object[] { TermFacetResult.builder().missing(3L) },
-                new Object[] { TermFacetResult.builder().total(1L) },
-                new Object[] { TermFacetResult.builder().other(6L) }, new Object[] { TermFacetResult.builder()
+                new Object[] { "dataType",
+                        TermFacetResult.builder()
+                                .dataType(com.commercetools.api.models.product.TermFacetResultType.findEnum("text")) },
+                new Object[] { "missing", TermFacetResult.builder().missing(3L) },
+                new Object[] { "total", TermFacetResult.builder().total(1L) },
+                new Object[] { "other", TermFacetResult.builder().other(6L) },
+                new Object[] { "terms", TermFacetResult.builder()
                         .terms(Collections.singletonList(new com.commercetools.api.models.product.FacetTermImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/WhitespaceTokenizerTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/WhitespaceTokenizerTest.java
index eeb2bc9eb4c..3b29ee6eb95 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/WhitespaceTokenizerTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product/WhitespaceTokenizerTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class WhitespaceTokenizerTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeIsActiveActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeIsActiveActionTest.java
index d6d239a4550..95c2a1658d6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeIsActiveActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeIsActiveActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountChangeIsActiveActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountChangeIsActiveActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountChangeIsActiveActionBuilder builder) {
         ProductDiscountChangeIsActiveAction productDiscountChangeIsActiveAction = builder.buildUnchecked();
         Assertions.assertThat(productDiscountChangeIsActiveAction)
                 .isInstanceOf(ProductDiscountChangeIsActiveAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountChangeIsActiveAction.builder().isActive(true) } };
+        return new Object[][] {
+                new Object[] { "isActive", ProductDiscountChangeIsActiveAction.builder().isActive(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeNameActionTest.java
index 63b78a83e53..118584e8f4e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountChangeNameActionBuilder builder) {
         ProductDiscountChangeNameAction productDiscountChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(productDiscountChangeNameAction).isInstanceOf(ProductDiscountChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountChangeNameAction.builder()
+        return new Object[][] { new Object[] { "name", ProductDiscountChangeNameAction.builder()
                 .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangePredicateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangePredicateActionTest.java
index db002aa79b5..9ab401a5a34 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangePredicateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangePredicateActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountChangePredicateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountChangePredicateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountChangePredicateActionBuilder builder) {
         ProductDiscountChangePredicateAction productDiscountChangePredicateAction = builder.buildUnchecked();
         Assertions.assertThat(productDiscountChangePredicateAction)
                 .isInstanceOf(ProductDiscountChangePredicateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductDiscountChangePredicateAction.builder().predicate("predicate") } };
+                new Object[] { "predicate", ProductDiscountChangePredicateAction.builder().predicate("predicate") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeSortOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeSortOrderActionTest.java
index 9c2cde5533f..03df7bea874 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeSortOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeSortOrderActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountChangeSortOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountChangeSortOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountChangeSortOrderActionBuilder builder) {
         ProductDiscountChangeSortOrderAction productDiscountChangeSortOrderAction = builder.buildUnchecked();
         Assertions.assertThat(productDiscountChangeSortOrderAction)
                 .isInstanceOf(ProductDiscountChangeSortOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductDiscountChangeSortOrderAction.builder().sortOrder("sortOrder") } };
+                new Object[] { "sortOrder", ProductDiscountChangeSortOrderAction.builder().sortOrder("sortOrder") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeValueActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeValueActionTest.java
index 3c0b3f3b0c8..987ae7a8ee3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeValueActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountChangeValueActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountChangeValueActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountChangeValueActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountChangeValueActionBuilder builder) {
         ProductDiscountChangeValueAction productDiscountChangeValueAction = builder.buildUnchecked();
         Assertions.assertThat(productDiscountChangeValueAction).isInstanceOf(ProductDiscountChangeValueAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountChangeValueAction.builder()
+        return new Object[][] { new Object[] { "value", ProductDiscountChangeValueAction.builder()
                 .value(new com.commercetools.api.models.product_discount.ProductDiscountValueDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountDraftTest.java
index e78ad2b8bc1..311236348d5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountDraftTest.java
@@ -3,42 +3,38 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountDraftBuilder builder) {
         ProductDiscountDraft productDiscountDraft = builder.buildUnchecked();
         Assertions.assertThat(productDiscountDraft).isInstanceOf(ProductDiscountDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductDiscountDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDiscountDraft.builder().key("key") },
-                new Object[] { ProductDiscountDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDiscountDraft.builder()
+                new Object[] { "name",
+                        ProductDiscountDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "key", ProductDiscountDraft.builder().key("key") },
+                new Object[] { "description",
+                        ProductDiscountDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "value", ProductDiscountDraft.builder()
                         .value(new com.commercetools.api.models.product_discount.ProductDiscountValueDraftImpl()) },
-                new Object[] { ProductDiscountDraft.builder().predicate("predicate") },
-                new Object[] { ProductDiscountDraft.builder().sortOrder("sortOrder") },
-                new Object[] { ProductDiscountDraft.builder().isActive(true) },
-                new Object[] { ProductDiscountDraft.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductDiscountDraft.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "predicate", ProductDiscountDraft.builder().predicate("predicate") },
+                new Object[] { "sortOrder", ProductDiscountDraft.builder().sortOrder("sortOrder") },
+                new Object[] { "isActive", ProductDiscountDraft.builder().isActive(true) },
+                new Object[] { "validFrom",
+                        ProductDiscountDraft.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        ProductDiscountDraft.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountMatchQueryTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountMatchQueryTest.java
index e1450ab3c8d..cf4b507e2c5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountMatchQueryTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountMatchQueryTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountMatchQueryTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountMatchQueryBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountMatchQueryBuilder builder) {
         ProductDiscountMatchQuery productDiscountMatchQuery = builder.buildUnchecked();
         Assertions.assertThat(productDiscountMatchQuery).isInstanceOf(ProductDiscountMatchQuery.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountMatchQuery.builder().productId("productId") },
-                new Object[] { ProductDiscountMatchQuery.builder().variantId(5) },
-                new Object[] { ProductDiscountMatchQuery.builder().staged(true) },
-                new Object[] { ProductDiscountMatchQuery.builder()
+        return new Object[][] {
+                new Object[] { "productId", ProductDiscountMatchQuery.builder().productId("productId") },
+                new Object[] { "variantId", ProductDiscountMatchQuery.builder().variantId(5) },
+                new Object[] { "staged", ProductDiscountMatchQuery.builder().staged(true) },
+                new Object[] { "price", ProductDiscountMatchQuery.builder()
                         .price(new com.commercetools.api.models.common.QueryPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountPagedQueryResponseTest.java
index 5b6d72aef82..63ccc2281e3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountPagedQueryResponseBuilder builder) {
         ProductDiscountPagedQueryResponse productDiscountPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(productDiscountPagedQueryResponse).isInstanceOf(ProductDiscountPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ProductDiscountPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ProductDiscountPagedQueryResponse.builder().count(2L) },
-                new Object[] { ProductDiscountPagedQueryResponse.builder().total(1L) },
-                new Object[] { ProductDiscountPagedQueryResponse.builder()
-                        .results(Collections.singletonList(
-                            new com.commercetools.api.models.product_discount.ProductDiscountImpl())) } };
+        return new Object[][] { new Object[] { "limit", ProductDiscountPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ProductDiscountPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ProductDiscountPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ProductDiscountPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        ProductDiscountPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.product_discount.ProductDiscountImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountReferenceTest.java
index 41276cf5483..8a14b1cb60e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountReferenceBuilder builder) {
         ProductDiscountReference productDiscountReference = builder.buildUnchecked();
         Assertions.assertThat(productDiscountReference).isInstanceOf(ProductDiscountReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductDiscountReference.builder()
-                        .obj(new com.commercetools.api.models.product_discount.ProductDiscountImpl()) },
-                new Object[] { ProductDiscountReference.builder().id("id") } };
+                new Object[] { "obj",
+                        ProductDiscountReference.builder()
+                                .obj(new com.commercetools.api.models.product_discount.ProductDiscountImpl()) },
+                new Object[] { "id", ProductDiscountReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountResourceIdentifierTest.java
index ac573302883..b399d7b8b85 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountResourceIdentifierBuilder builder) {
         ProductDiscountResourceIdentifier productDiscountResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(productDiscountResourceIdentifier).isInstanceOf(ProductDiscountResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountResourceIdentifier.builder().id("id") },
-                new Object[] { ProductDiscountResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", ProductDiscountResourceIdentifier.builder().id("id") },
+                new Object[] { "key", ProductDiscountResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetDescriptionActionTest.java
index f64f3902e8b..051c2da1fe6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetDescriptionActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountSetDescriptionActionBuilder builder) {
         ProductDiscountSetDescriptionAction productDiscountSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(productDiscountSetDescriptionAction)
                 .isInstanceOf(ProductDiscountSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountSetDescriptionAction.builder()
+        return new Object[][] { new Object[] { "description", ProductDiscountSetDescriptionAction.builder()
                 .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetKeyActionTest.java
index e129889c0f3..b6d862a3904 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountSetKeyActionBuilder builder) {
         ProductDiscountSetKeyAction productDiscountSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(productDiscountSetKeyAction).isInstanceOf(ProductDiscountSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ProductDiscountSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetValidFromActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetValidFromActionTest.java
index ef0bc18d185..a1641379ec1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetValidFromActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetValidFromActionTest.java
@@ -3,30 +3,22 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountSetValidFromActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountSetValidFromActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountSetValidFromActionBuilder builder) {
         ProductDiscountSetValidFromAction productDiscountSetValidFromAction = builder.buildUnchecked();
         Assertions.assertThat(productDiscountSetValidFromAction).isInstanceOf(ProductDiscountSetValidFromAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "validFrom",
                 ProductDiscountSetValidFromAction.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetValidFromAndUntilActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetValidFromAndUntilActionTest.java
index fec25fdf031..e054f938e68 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetValidFromAndUntilActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetValidFromAndUntilActionTest.java
@@ -3,34 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountSetValidFromAndUntilActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountSetValidFromAndUntilActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountSetValidFromAndUntilActionBuilder builder) {
         ProductDiscountSetValidFromAndUntilAction productDiscountSetValidFromAndUntilAction = builder.buildUnchecked();
         Assertions.assertThat(productDiscountSetValidFromAndUntilAction)
                 .isInstanceOf(ProductDiscountSetValidFromAndUntilAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductDiscountSetValidFromAndUntilAction.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductDiscountSetValidFromAndUntilAction.builder()
+                new Object[] { "validFrom",
+                        ProductDiscountSetValidFromAndUntilAction.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil", ProductDiscountSetValidFromAndUntilAction.builder()
                         .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetValidUntilActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetValidUntilActionTest.java
index 153cda93cc2..7e36ca084c0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetValidUntilActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountSetValidUntilActionTest.java
@@ -3,31 +3,23 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountSetValidUntilActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountSetValidUntilActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountSetValidUntilActionBuilder builder) {
         ProductDiscountSetValidUntilAction productDiscountSetValidUntilAction = builder.buildUnchecked();
         Assertions.assertThat(productDiscountSetValidUntilAction)
                 .isInstanceOf(ProductDiscountSetValidUntilAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "validUntil",
                 ProductDiscountSetValidUntilAction.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountTest.java
index dd2ea6f8a45..ab0cd147c50 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountTest.java
@@ -4,53 +4,52 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountBuilder builder) {
         ProductDiscount productDiscount = builder.buildUnchecked();
         Assertions.assertThat(productDiscount).isInstanceOf(ProductDiscount.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscount.builder().id("id") },
-                new Object[] { ProductDiscount.builder().version(2L) },
-                new Object[] { ProductDiscount.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductDiscount.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductDiscount.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", ProductDiscount.builder().id("id") },
+                new Object[] { "version", ProductDiscount.builder().version(2L) },
+                new Object[] { "createdAt",
+                        ProductDiscount.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        ProductDiscount.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        ProductDiscount.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         ProductDiscount.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] {
+                new Object[] { "name",
                         ProductDiscount.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDiscount.builder().key("key") },
-                new Object[] { ProductDiscount.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDiscount.builder()
-                        .value(new com.commercetools.api.models.product_discount.ProductDiscountValueImpl()) },
-                new Object[] { ProductDiscount.builder().predicate("predicate") },
-                new Object[] { ProductDiscount.builder().sortOrder("sortOrder") },
-                new Object[] { ProductDiscount.builder().isActive(true) },
-                new Object[] {
+                new Object[] { "key", ProductDiscount.builder().key("key") },
+                new Object[] { "description",
+                        ProductDiscount.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "value",
+                        ProductDiscount.builder()
+                                .value(new com.commercetools.api.models.product_discount.ProductDiscountValueImpl()) },
+                new Object[] { "predicate", ProductDiscount.builder().predicate("predicate") },
+                new Object[] { "sortOrder", ProductDiscount.builder().sortOrder("sortOrder") },
+                new Object[] { "isActive", ProductDiscount.builder().isActive(true) },
+                new Object[] { "references",
                         ProductDiscount.builder()
                                 .references(Collections
                                         .singletonList(new com.commercetools.api.models.common.ReferenceImpl())) },
-                new Object[] { ProductDiscount.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductDiscount.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "validFrom",
+                        ProductDiscount.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        ProductDiscount.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountUpdateTest.java
index 060021321b9..6d2df0063a2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountUpdateTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountUpdateBuilder builder) {
         ProductDiscountUpdate productDiscountUpdate = builder.buildUnchecked();
         Assertions.assertThat(productDiscountUpdate).isInstanceOf(ProductDiscountUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountUpdate.builder().version(2L) },
-                new Object[] { ProductDiscountUpdate.builder()
+        return new Object[][] { new Object[] { "version", ProductDiscountUpdate.builder().version(2L) },
+                new Object[] { "actions", ProductDiscountUpdate.builder()
                         .actions(Collections.singletonList(
                             new com.commercetools.api.models.product_discount.ProductDiscountUpdateActionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueAbsoluteDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueAbsoluteDraftTest.java
index 6cec2e08078..fb9d87ca749 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueAbsoluteDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueAbsoluteDraftTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountValueAbsoluteDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountValueAbsoluteDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountValueAbsoluteDraftBuilder builder) {
         ProductDiscountValueAbsoluteDraft productDiscountValueAbsoluteDraft = builder.buildUnchecked();
         Assertions.assertThat(productDiscountValueAbsoluteDraft).isInstanceOf(ProductDiscountValueAbsoluteDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountValueAbsoluteDraft.builder()
+        return new Object[][] { new Object[] { "money", ProductDiscountValueAbsoluteDraft.builder()
                 .money(Collections.singletonList(new com.commercetools.api.models.common.MoneyImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueAbsoluteTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueAbsoluteTest.java
index a1332647902..86520ac0e2d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueAbsoluteTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueAbsoluteTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountValueAbsoluteTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountValueAbsoluteBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountValueAbsoluteBuilder builder) {
         ProductDiscountValueAbsolute productDiscountValueAbsolute = builder.buildUnchecked();
         Assertions.assertThat(productDiscountValueAbsolute).isInstanceOf(ProductDiscountValueAbsolute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountValueAbsolute.builder()
+        return new Object[][] { new Object[] { "money", ProductDiscountValueAbsolute.builder()
                 .money(Collections.singletonList(new com.commercetools.api.models.common.CentPrecisionMoneyImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueExternalDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueExternalDraftTest.java
index e1cbbad02af..6f29193b112 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueExternalDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueExternalDraftTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountValueExternalDraftTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueExternalTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueExternalTest.java
index 66e00f22fd7..592e400d2b6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueExternalTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueExternalTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountValueExternalTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueRelativeDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueRelativeDraftTest.java
index 3f7b602a25f..7422594253b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueRelativeDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueRelativeDraftTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountValueRelativeDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountValueRelativeDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountValueRelativeDraftBuilder builder) {
         ProductDiscountValueRelativeDraft productDiscountValueRelativeDraft = builder.buildUnchecked();
         Assertions.assertThat(productDiscountValueRelativeDraft).isInstanceOf(ProductDiscountValueRelativeDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountValueRelativeDraft.builder().permyriad(1L) } };
+        return new Object[][] {
+                new Object[] { "permyriad", ProductDiscountValueRelativeDraft.builder().permyriad(1L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueRelativeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueRelativeTest.java
index 1059824e3c2..9caa7294c65 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueRelativeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_discount/ProductDiscountValueRelativeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountValueRelativeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDiscountValueRelativeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDiscountValueRelativeBuilder builder) {
         ProductDiscountValueRelative productDiscountValueRelative = builder.buildUnchecked();
         Assertions.assertThat(productDiscountValueRelative).isInstanceOf(ProductDiscountValueRelative.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDiscountValueRelative.builder().permyriad(1L) } };
+        return new Object[][] { new Object[] { "permyriad", ProductDiscountValueRelative.builder().permyriad(1L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductPagedSearchResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductPagedSearchResponseTest.java
index 9bfc8f172aa..10204803a81 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductPagedSearchResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductPagedSearchResponseTest.java
@@ -3,38 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductPagedSearchResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductPagedSearchResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductPagedSearchResponseBuilder builder) {
         ProductPagedSearchResponse productPagedSearchResponse = builder.buildUnchecked();
         Assertions.assertThat(productPagedSearchResponse).isInstanceOf(ProductPagedSearchResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductPagedSearchResponse.builder().total(1L) },
-                new Object[] { ProductPagedSearchResponse.builder().offset(3) },
-                new Object[] { ProductPagedSearchResponse.builder().limit(7) },
-                new Object[] { ProductPagedSearchResponse.builder()
-                        .facets(Collections.singletonList(
-                            new com.commercetools.api.models.product_search.ProductSearchFacetResultImpl())) },
-                new Object[] { ProductPagedSearchResponse.builder()
-                        .results(Collections.singletonList(
-                            new com.commercetools.api.models.product_search.ProductSearchResultImpl())) } };
+        return new Object[][] { new Object[] { "total", ProductPagedSearchResponse.builder().total(1L) },
+                new Object[] { "offset", ProductPagedSearchResponse.builder().offset(3) },
+                new Object[] { "limit", ProductPagedSearchResponse.builder().limit(7) },
+                new Object[] { "facets",
+                        ProductPagedSearchResponse.builder()
+                                .facets(Collections.singletonList(
+                                    new com.commercetools.api.models.product_search.ProductSearchFacetResultImpl())) },
+                new Object[] { "results",
+                        ProductPagedSearchResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.product_search.ProductSearchResultImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchErrorResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchErrorResponseTest.java
index d1164790c7f..8adae340bac 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchErrorResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchErrorResponseTest.java
@@ -3,32 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchErrorResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchErrorResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchErrorResponseBuilder builder) {
         ProductSearchErrorResponse productSearchErrorResponse = builder.buildUnchecked();
         Assertions.assertThat(productSearchErrorResponse).isInstanceOf(ProductSearchErrorResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchErrorResponse.builder().statusCode(8) },
-                new Object[] { ProductSearchErrorResponse.builder().message("message") },
-                new Object[] { ProductSearchErrorResponse.builder()
+        return new Object[][] { new Object[] { "statusCode", ProductSearchErrorResponse.builder().statusCode(8) },
+                new Object[] { "message", ProductSearchErrorResponse.builder().message("message") },
+                new Object[] { "errors", ProductSearchErrorResponse.builder()
                         .errors(
                             Collections.singletonList(new com.commercetools.api.models.error.ErrorObjectImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetCountExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetCountExpressionTest.java
index 764a1daec5e..32de28c2dad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetCountExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetCountExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetCountExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchFacetCountExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchFacetCountExpressionBuilder builder) {
         ProductSearchFacetCountExpression productSearchFacetCountExpression = builder.buildUnchecked();
         Assertions.assertThat(productSearchFacetCountExpression).isInstanceOf(ProductSearchFacetCountExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchFacetCountExpression.builder()
+        return new Object[][] { new Object[] { "count", ProductSearchFacetCountExpression.builder()
                 .count(new com.commercetools.api.models.product_search.ProductSearchFacetCountValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetCountValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetCountValueTest.java
index 90b68cf21e9..3edb7c6a465 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetCountValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetCountValueTest.java
@@ -1,39 +1,33 @@
 
 package com.commercetools.api.models.product_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetCountValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchFacetCountValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchFacetCountValueBuilder builder) {
         ProductSearchFacetCountValue productSearchFacetCountValue = builder.buildUnchecked();
         Assertions.assertThat(productSearchFacetCountValue).isInstanceOf(ProductSearchFacetCountValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchFacetCountValue.builder().name("name") },
-                new Object[] {
+        return new Object[][] { new Object[] { "name", ProductSearchFacetCountValue.builder().name("name") },
+                new Object[] { "scope",
                         ProductSearchFacetCountValue.builder()
                                 .scope(com.commercetools.api.models.product_search.ProductSearchFacetScopeEnum
                                         .findEnum("all")) },
-                new Object[] { ProductSearchFacetCountValue.builder()
-                        .filter(new com.commercetools.api.models.search.SearchQueryImpl()) },
-                new Object[] { ProductSearchFacetCountValue.builder()
-                        .level(com.commercetools.api.models.product_search.ProductSearchFacetCountLevelEnum
-                                .findEnum("products")) } };
+                new Object[] { "filter",
+                        ProductSearchFacetCountValue.builder()
+                                .filter(new com.commercetools.api.models.search.SearchQueryImpl()) },
+                new Object[] { "level",
+                        ProductSearchFacetCountValue.builder()
+                                .level(com.commercetools.api.models.product_search.ProductSearchFacetCountLevelEnum
+                                        .findEnum("products")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetDistinctBucketSortExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetDistinctBucketSortExpressionTest.java
index d89ab101ed6..9a1a5e95988 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetDistinctBucketSortExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetDistinctBucketSortExpressionTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.product_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetDistinctBucketSortExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchFacetDistinctBucketSortExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchFacetDistinctBucketSortExpressionBuilder builder) {
         ProductSearchFacetDistinctBucketSortExpression productSearchFacetDistinctBucketSortExpression = builder
                 .buildUnchecked();
         Assertions.assertThat(productSearchFacetDistinctBucketSortExpression)
                 .isInstanceOf(ProductSearchFacetDistinctBucketSortExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSearchFacetDistinctBucketSortExpression.builder()
-                        .by(com.commercetools.api.models.product_search.ProductSearchFacetDistinctBucketSortBy
-                                .findEnum("count")) },
-                new Object[] { ProductSearchFacetDistinctBucketSortExpression.builder()
+                new Object[] { "by",
+                        ProductSearchFacetDistinctBucketSortExpression.builder()
+                                .by(com.commercetools.api.models.product_search.ProductSearchFacetDistinctBucketSortBy
+                                        .findEnum("count")) },
+                new Object[] { "order", ProductSearchFacetDistinctBucketSortExpression.builder()
                         .order(com.commercetools.api.models.search.SearchSortOrder.findEnum("asc")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetDistinctExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetDistinctExpressionTest.java
index 09227d1b8a1..49c53558640 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetDistinctExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetDistinctExpressionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetDistinctExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchFacetDistinctExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchFacetDistinctExpressionBuilder builder) {
         ProductSearchFacetDistinctExpression productSearchFacetDistinctExpression = builder.buildUnchecked();
         Assertions.assertThat(productSearchFacetDistinctExpression)
                 .isInstanceOf(ProductSearchFacetDistinctExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchFacetDistinctExpression.builder()
+        return new Object[][] { new Object[] { "distinct", ProductSearchFacetDistinctExpression.builder()
                 .distinct(new com.commercetools.api.models.product_search.ProductSearchFacetDistinctValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetDistinctValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetDistinctValueTest.java
index 244d53f33ff..373edf1137d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetDistinctValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetDistinctValueTest.java
@@ -3,50 +3,45 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetDistinctValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchFacetDistinctValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchFacetDistinctValueBuilder builder) {
         ProductSearchFacetDistinctValue productSearchFacetDistinctValue = builder.buildUnchecked();
         Assertions.assertThat(productSearchFacetDistinctValue).isInstanceOf(ProductSearchFacetDistinctValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchFacetDistinctValue.builder().name("name") },
-                new Object[] {
+        return new Object[][] { new Object[] { "name", ProductSearchFacetDistinctValue.builder().name("name") },
+                new Object[] { "scope",
                         ProductSearchFacetDistinctValue.builder()
                                 .scope(com.commercetools.api.models.product_search.ProductSearchFacetScopeEnum
                                         .findEnum("all")) },
-                new Object[] { ProductSearchFacetDistinctValue.builder()
-                        .filter(new com.commercetools.api.models.search.SearchQueryImpl()) },
-                new Object[] { ProductSearchFacetDistinctValue.builder()
-                        .level(com.commercetools.api.models.product_search.ProductSearchFacetCountLevelEnum
-                                .findEnum("products")) },
-                new Object[] { ProductSearchFacetDistinctValue.builder().field("field") },
-                new Object[] {
+                new Object[] { "filter",
+                        ProductSearchFacetDistinctValue.builder()
+                                .filter(new com.commercetools.api.models.search.SearchQueryImpl()) },
+                new Object[] { "level",
+                        ProductSearchFacetDistinctValue.builder()
+                                .level(com.commercetools.api.models.product_search.ProductSearchFacetCountLevelEnum
+                                        .findEnum("products")) },
+                new Object[] { "field", ProductSearchFacetDistinctValue.builder().field("field") },
+                new Object[] { "includes",
                         ProductSearchFacetDistinctValue.builder().includes(Collections.singletonList("includes")) },
-                new Object[] { ProductSearchFacetDistinctValue.builder()
+                new Object[] { "sort", ProductSearchFacetDistinctValue.builder()
                         .sort(
                             new com.commercetools.api.models.product_search.ProductSearchFacetDistinctBucketSortExpressionImpl()) },
-                new Object[] { ProductSearchFacetDistinctValue.builder().limit(7) },
-                new Object[] { ProductSearchFacetDistinctValue.builder().language("language") },
-                new Object[] { ProductSearchFacetDistinctValue.builder()
-                        .fieldType(com.commercetools.api.models.search.SearchFieldType.findEnum("boolean")) },
-                new Object[] { ProductSearchFacetDistinctValue.builder().missing("missing") } };
+                new Object[] { "limit", ProductSearchFacetDistinctValue.builder().limit(7) },
+                new Object[] { "language", ProductSearchFacetDistinctValue.builder().language("language") },
+                new Object[] { "fieldType",
+                        ProductSearchFacetDistinctValue.builder()
+                                .fieldType(com.commercetools.api.models.search.SearchFieldType.findEnum("boolean")) },
+                new Object[] { "missing", ProductSearchFacetDistinctValue.builder().missing("missing") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetExpressionTest.java
index 27b37cafce4..c4054107651 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetExpressionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_search;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetExpressionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetRangesExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetRangesExpressionTest.java
index d1f5f605bda..2a4118a0c7b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetRangesExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetRangesExpressionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetRangesExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchFacetRangesExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchFacetRangesExpressionBuilder builder) {
         ProductSearchFacetRangesExpression productSearchFacetRangesExpression = builder.buildUnchecked();
         Assertions.assertThat(productSearchFacetRangesExpression)
                 .isInstanceOf(ProductSearchFacetRangesExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchFacetRangesExpression.builder()
+        return new Object[][] { new Object[] { "ranges", ProductSearchFacetRangesExpression.builder()
                 .ranges(new com.commercetools.api.models.product_search.ProductSearchFacetRangesValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetRangesFacetRangeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetRangesFacetRangeTest.java
index 27bb4c2f424..d1ededcb548 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetRangesFacetRangeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetRangesFacetRangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.product_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetRangesFacetRangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchFacetRangesFacetRangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchFacetRangesFacetRangeBuilder builder) {
         ProductSearchFacetRangesFacetRange productSearchFacetRangesFacetRange = builder.buildUnchecked();
         Assertions.assertThat(productSearchFacetRangesFacetRange)
                 .isInstanceOf(ProductSearchFacetRangesFacetRange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchFacetRangesFacetRange.builder().from("from") },
-                new Object[] { ProductSearchFacetRangesFacetRange.builder().to("to") },
-                new Object[] { ProductSearchFacetRangesFacetRange.builder().key("key") } };
+        return new Object[][] { new Object[] { "from", ProductSearchFacetRangesFacetRange.builder().from("from") },
+                new Object[] { "to", ProductSearchFacetRangesFacetRange.builder().to("to") },
+                new Object[] { "key", ProductSearchFacetRangesFacetRange.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetRangesValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetRangesValueTest.java
index 10398ad54b4..cb9fb701dd4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetRangesValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetRangesValueTest.java
@@ -3,45 +3,39 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetRangesValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchFacetRangesValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchFacetRangesValueBuilder builder) {
         ProductSearchFacetRangesValue productSearchFacetRangesValue = builder.buildUnchecked();
         Assertions.assertThat(productSearchFacetRangesValue).isInstanceOf(ProductSearchFacetRangesValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchFacetRangesValue.builder().name("name") },
-                new Object[] {
+        return new Object[][] { new Object[] { "name", ProductSearchFacetRangesValue.builder().name("name") },
+                new Object[] { "scope",
                         ProductSearchFacetRangesValue.builder()
                                 .scope(com.commercetools.api.models.product_search.ProductSearchFacetScopeEnum
                                         .findEnum("all")) },
-                new Object[] { ProductSearchFacetRangesValue.builder()
-                        .filter(new com.commercetools.api.models.search.SearchQueryImpl()) },
-                new Object[] { ProductSearchFacetRangesValue.builder()
-                        .level(com.commercetools.api.models.product_search.ProductSearchFacetCountLevelEnum
-                                .findEnum("products")) },
-                new Object[] { ProductSearchFacetRangesValue.builder().field("field") },
-                new Object[] { ProductSearchFacetRangesValue.builder()
+                new Object[] { "filter",
+                        ProductSearchFacetRangesValue.builder()
+                                .filter(new com.commercetools.api.models.search.SearchQueryImpl()) },
+                new Object[] { "level",
+                        ProductSearchFacetRangesValue.builder()
+                                .level(com.commercetools.api.models.product_search.ProductSearchFacetCountLevelEnum
+                                        .findEnum("products")) },
+                new Object[] { "field", ProductSearchFacetRangesValue.builder().field("field") },
+                new Object[] { "ranges", ProductSearchFacetRangesValue.builder()
                         .ranges(Collections.singletonList(
                             new com.commercetools.api.models.product_search.ProductSearchFacetRangesFacetRangeImpl())) },
-                new Object[] { ProductSearchFacetRangesValue.builder().language("language") },
-                new Object[] { ProductSearchFacetRangesValue.builder()
+                new Object[] { "language", ProductSearchFacetRangesValue.builder().language("language") },
+                new Object[] { "fieldType", ProductSearchFacetRangesValue.builder()
                         .fieldType(com.commercetools.api.models.search.SearchFieldType.findEnum("boolean")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultBucketEntryTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultBucketEntryTest.java
index 3d21b109377..9e7e34f92ae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultBucketEntryTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultBucketEntryTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.product_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetResultBucketEntryTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchFacetResultBucketEntryBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchFacetResultBucketEntryBuilder builder) {
         ProductSearchFacetResultBucketEntry productSearchFacetResultBucketEntry = builder.buildUnchecked();
         Assertions.assertThat(productSearchFacetResultBucketEntry)
                 .isInstanceOf(ProductSearchFacetResultBucketEntry.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchFacetResultBucketEntry.builder().key("key") },
-                new Object[] { ProductSearchFacetResultBucketEntry.builder().count(2) } };
+        return new Object[][] { new Object[] { "key", ProductSearchFacetResultBucketEntry.builder().key("key") },
+                new Object[] { "count", ProductSearchFacetResultBucketEntry.builder().count(2) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultBucketTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultBucketTest.java
index 2e3b242da9f..a5968d03fed 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultBucketTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultBucketTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetResultBucketTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchFacetResultBucketBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchFacetResultBucketBuilder builder) {
         ProductSearchFacetResultBucket productSearchFacetResultBucket = builder.buildUnchecked();
         Assertions.assertThat(productSearchFacetResultBucket).isInstanceOf(ProductSearchFacetResultBucket.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchFacetResultBucket.builder()
+        return new Object[][] { new Object[] { "buckets", ProductSearchFacetResultBucket.builder()
                 .buckets(Collections.singletonList(
                     new com.commercetools.api.models.product_search.ProductSearchFacetResultBucketEntryImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultCountTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultCountTest.java
index 8153d897cf5..52c6e79b01d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultCountTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultCountTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetResultCountTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchFacetResultCountBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchFacetResultCountBuilder builder) {
         ProductSearchFacetResultCount productSearchFacetResultCount = builder.buildUnchecked();
         Assertions.assertThat(productSearchFacetResultCount).isInstanceOf(ProductSearchFacetResultCount.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchFacetResultCount.builder().value(6L) } };
+        return new Object[][] { new Object[] { "value", ProductSearchFacetResultCount.builder().value(6L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultTest.java
index e6867567e29..61ea474647a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchFacetResultTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchFacetResultTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchFacetResultBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchFacetResultBuilder builder) {
         ProductSearchFacetResult productSearchFacetResult = builder.buildUnchecked();
         Assertions.assertThat(productSearchFacetResult).isInstanceOf(ProductSearchFacetResult.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchFacetResult.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", ProductSearchFacetResult.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchMatchingVariantEntryTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchMatchingVariantEntryTest.java
index 00fde737a53..23a930808a0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchMatchingVariantEntryTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchMatchingVariantEntryTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchMatchingVariantEntryTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchMatchingVariantEntryBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchMatchingVariantEntryBuilder builder) {
         ProductSearchMatchingVariantEntry productSearchMatchingVariantEntry = builder.buildUnchecked();
         Assertions.assertThat(productSearchMatchingVariantEntry).isInstanceOf(ProductSearchMatchingVariantEntry.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchMatchingVariantEntry.builder().id(2) },
-                new Object[] { ProductSearchMatchingVariantEntry.builder().sku("sku") } };
+        return new Object[][] { new Object[] { "id", ProductSearchMatchingVariantEntry.builder().id(2) },
+                new Object[] { "sku", ProductSearchMatchingVariantEntry.builder().sku("sku") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchMatchingVariantsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchMatchingVariantsTest.java
index 10c1d65da12..acc2807aeb3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchMatchingVariantsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchMatchingVariantsTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchMatchingVariantsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchMatchingVariantsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchMatchingVariantsBuilder builder) {
         ProductSearchMatchingVariants productSearchMatchingVariants = builder.buildUnchecked();
         Assertions.assertThat(productSearchMatchingVariants).isInstanceOf(ProductSearchMatchingVariants.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchMatchingVariants.builder().allMatched(true) },
-                new Object[] { ProductSearchMatchingVariants.builder()
+        return new Object[][] { new Object[] { "allMatched", ProductSearchMatchingVariants.builder().allMatched(true) },
+                new Object[] { "matchedVariants", ProductSearchMatchingVariants.builder()
                         .matchedVariants(Collections.singletonList(
                             new com.commercetools.api.models.product_search.ProductSearchMatchingVariantEntryImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchProjectionParamsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchProjectionParamsTest.java
index 8dbc3e68c11..8fd2f55d0a5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchProjectionParamsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchProjectionParamsTest.java
@@ -3,41 +3,38 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchProjectionParamsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchProjectionParamsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchProjectionParamsBuilder builder) {
         ProductSearchProjectionParams productSearchProjectionParams = builder.buildUnchecked();
         Assertions.assertThat(productSearchProjectionParams).isInstanceOf(ProductSearchProjectionParams.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSearchProjectionParams.builder().expand(Collections.singletonList("expand")) },
-                new Object[] { ProductSearchProjectionParams.builder().staged(true) },
-                new Object[] { ProductSearchProjectionParams.builder().priceCurrency("priceCurrency") },
-                new Object[] { ProductSearchProjectionParams.builder().priceCountry("priceCountry") },
-                new Object[] { ProductSearchProjectionParams.builder().priceCustomerGroup("priceCustomerGroup") },
-                new Object[] { ProductSearchProjectionParams.builder()
+                new Object[] { "expand",
+                        ProductSearchProjectionParams.builder().expand(Collections.singletonList("expand")) },
+                new Object[] { "staged", ProductSearchProjectionParams.builder().staged(true) },
+                new Object[] { "priceCurrency",
+                        ProductSearchProjectionParams.builder().priceCurrency("priceCurrency") },
+                new Object[] { "priceCountry", ProductSearchProjectionParams.builder().priceCountry("priceCountry") },
+                new Object[] { "priceCustomerGroup",
+                        ProductSearchProjectionParams.builder().priceCustomerGroup("priceCustomerGroup") },
+                new Object[] { "priceCustomerGroupAssignments", ProductSearchProjectionParams.builder()
                         .priceCustomerGroupAssignments(Collections.singletonList("priceCustomerGroupAssignments")) },
-                new Object[] { ProductSearchProjectionParams.builder().priceChannel("priceChannel") },
-                new Object[] { ProductSearchProjectionParams.builder()
-                        .localeProjection(Collections.singletonList("localeProjection")) },
-                new Object[] { ProductSearchProjectionParams.builder().storeProjection("storeProjection") } };
+                new Object[] { "priceChannel", ProductSearchProjectionParams.builder().priceChannel("priceChannel") },
+                new Object[] { "localeProjection",
+                        ProductSearchProjectionParams.builder()
+                                .localeProjection(Collections.singletonList("localeProjection")) },
+                new Object[] { "storeProjection",
+                        ProductSearchProjectionParams.builder().storeProjection("storeProjection") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchRequestTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchRequestTest.java
index 6999da58653..c8f1116a03e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchRequestTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchRequestTest.java
@@ -3,44 +3,39 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchRequestBuilder builder) {
         ProductSearchRequest productSearchRequest = builder.buildUnchecked();
         Assertions.assertThat(productSearchRequest).isInstanceOf(ProductSearchRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSearchRequest.builder()
-                        .query(new com.commercetools.api.models.search.SearchQueryImpl()) },
-                new Object[] { ProductSearchRequest.builder()
-                        .sort(Collections.singletonList(new com.commercetools.api.models.search.SearchSortingImpl())) },
-                new Object[] { ProductSearchRequest.builder().limit(7) },
-                new Object[] { ProductSearchRequest.builder().offset(3) },
-                new Object[] { ProductSearchRequest.builder().markMatchingVariants(true) },
-                new Object[] { ProductSearchRequest.builder()
+                new Object[] { "query",
+                        ProductSearchRequest.builder()
+                                .query(new com.commercetools.api.models.search.SearchQueryImpl()) },
+                new Object[] { "sort",
+                        ProductSearchRequest.builder()
+                                .sort(Collections
+                                        .singletonList(new com.commercetools.api.models.search.SearchSortingImpl())) },
+                new Object[] { "limit", ProductSearchRequest.builder().limit(7) },
+                new Object[] { "offset", ProductSearchRequest.builder().offset(3) },
+                new Object[] { "markMatchingVariants", ProductSearchRequest.builder().markMatchingVariants(true) },
+                new Object[] { "productProjectionParameters", ProductSearchRequest.builder()
                         .productProjectionParameters(
                             new com.commercetools.api.models.product_search.ProductSearchProjectionParamsImpl()) },
-                new Object[] { ProductSearchRequest.builder()
+                new Object[] { "facets", ProductSearchRequest.builder()
                         .facets(Collections.singletonList(
                             new com.commercetools.api.models.product_search.ProductSearchFacetExpressionImpl())) },
-                new Object[] { ProductSearchRequest.builder()
+                new Object[] { "postFilter", ProductSearchRequest.builder()
                         .postFilter(new com.commercetools.api.models.search.SearchQueryImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchResultTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchResultTest.java
index 741a9c73760..865ce1f5028 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchResultTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_search/ProductSearchResultTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.product_search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSearchResultTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSearchResultBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSearchResultBuilder builder) {
         ProductSearchResult productSearchResult = builder.buildUnchecked();
         Assertions.assertThat(productSearchResult).isInstanceOf(ProductSearchResult.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSearchResult.builder().id("id") },
-                new Object[] { ProductSearchResult.builder()
+        return new Object[][] { new Object[] { "id", ProductSearchResult.builder().id("id") },
+                new Object[] { "matchingVariants", ProductSearchResult.builder()
                         .matchingVariants(
                             new com.commercetools.api.models.product_search.ProductSearchMatchingVariantsImpl()) },
-                new Object[] { ProductSearchResult.builder()
+                new Object[] { "productProjection", ProductSearchResult.builder()
                         .productProjection(new com.commercetools.api.models.product.ProductProjectionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/AssignedProductReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/AssignedProductReferenceTest.java
index 6ecf6679e42..a9383184b76 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/AssignedProductReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/AssignedProductReferenceTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssignedProductReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssignedProductReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssignedProductReferenceBuilder builder) {
         AssignedProductReference assignedProductReference = builder.buildUnchecked();
         Assertions.assertThat(assignedProductReference).isInstanceOf(AssignedProductReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { AssignedProductReference.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { AssignedProductReference.builder()
-                        .variantSelection(
-                            new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) },
-                new Object[] { AssignedProductReference.builder()
+                new Object[] { "product",
+                        AssignedProductReference.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "variantSelection",
+                        AssignedProductReference.builder()
+                                .variantSelection(
+                                    new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) },
+                new Object[] { "variantExclusion", AssignedProductReference.builder()
                         .variantExclusion(
                             new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/AssignedProductSelectionPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/AssignedProductSelectionPagedQueryResponseTest.java
index 612780b2c1f..f0e9e430949 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/AssignedProductSelectionPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/AssignedProductSelectionPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssignedProductSelectionPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssignedProductSelectionPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssignedProductSelectionPagedQueryResponseBuilder builder) {
         AssignedProductSelectionPagedQueryResponse assignedProductSelectionPagedQueryResponse = builder
                 .buildUnchecked();
         Assertions.assertThat(assignedProductSelectionPagedQueryResponse)
                 .isInstanceOf(AssignedProductSelectionPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssignedProductSelectionPagedQueryResponse.builder().limit(7L) },
-                new Object[] { AssignedProductSelectionPagedQueryResponse.builder().offset(3L) },
-                new Object[] { AssignedProductSelectionPagedQueryResponse.builder().count(2L) },
-                new Object[] { AssignedProductSelectionPagedQueryResponse.builder().total(1L) },
-                new Object[] { AssignedProductSelectionPagedQueryResponse.builder()
+        return new Object[][] {
+                new Object[] { "limit", AssignedProductSelectionPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", AssignedProductSelectionPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", AssignedProductSelectionPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", AssignedProductSelectionPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", AssignedProductSelectionPagedQueryResponse.builder()
                         .results(Collections.singletonList(
                             new com.commercetools.api.models.product_selection.AssignedProductSelectionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/AssignedProductSelectionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/AssignedProductSelectionTest.java
index 003bf6757bf..e8395b29053 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/AssignedProductSelectionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/AssignedProductSelectionTest.java
@@ -3,38 +3,32 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssignedProductSelectionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssignedProductSelectionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssignedProductSelectionBuilder builder) {
         AssignedProductSelection assignedProductSelection = builder.buildUnchecked();
         Assertions.assertThat(assignedProductSelection).isInstanceOf(AssignedProductSelection.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssignedProductSelection.builder()
+        return new Object[][] { new Object[] { "productSelection", AssignedProductSelection.builder()
                 .productSelection(new com.commercetools.api.models.product_selection.ProductSelectionReferenceImpl()) },
-                new Object[] { AssignedProductSelection.builder()
-                        .variantSelection(
-                            new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) },
-                new Object[] { AssignedProductSelection.builder()
-                        .variantExclusion(
-                            new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) },
-                new Object[] {
+                new Object[] { "variantSelection",
+                        AssignedProductSelection.builder()
+                                .variantSelection(
+                                    new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) },
+                new Object[] { "variantExclusion",
+                        AssignedProductSelection.builder()
+                                .variantExclusion(
+                                    new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) },
+                new Object[] { "createdAt",
                         AssignedProductSelection.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionAddProductActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionAddProductActionTest.java
index a4284bbc96e..6ec597cc0c7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionAddProductActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionAddProductActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionAddProductActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionAddProductActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionAddProductActionBuilder builder) {
         ProductSelectionAddProductAction productSelectionAddProductAction = builder.buildUnchecked();
         Assertions.assertThat(productSelectionAddProductAction).isInstanceOf(ProductSelectionAddProductAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionAddProductAction.builder()
-                        .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
-                new Object[] { ProductSelectionAddProductAction.builder()
+                new Object[] { "product",
+                        ProductSelectionAddProductAction.builder()
+                                .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
+                new Object[] { "variantSelection", ProductSelectionAddProductAction.builder()
                         .variantSelection(
                             new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionAssignmentTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionAssignmentTest.java
index b304b3c3d08..a515dfbdbbc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionAssignmentTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionAssignmentTest.java
@@ -1,39 +1,33 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionAssignmentTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionAssignmentBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionAssignmentBuilder builder) {
         ProductSelectionAssignment productSelectionAssignment = builder.buildUnchecked();
         Assertions.assertThat(productSelectionAssignment).isInstanceOf(ProductSelectionAssignment.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionAssignment.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductSelectionAssignment.builder()
+                new Object[] { "product",
+                        ProductSelectionAssignment.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "productSelection", ProductSelectionAssignment.builder()
                         .productSelection(
                             new com.commercetools.api.models.product_selection.ProductSelectionReferenceImpl()) },
-                new Object[] { ProductSelectionAssignment.builder()
-                        .variantSelection(
-                            new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) },
-                new Object[] { ProductSelectionAssignment.builder()
+                new Object[] { "variantSelection",
+                        ProductSelectionAssignment.builder()
+                                .variantSelection(
+                                    new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) },
+                new Object[] { "variantExclusion", ProductSelectionAssignment.builder()
                         .variantExclusion(
                             new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionChangeNameActionTest.java
index 497e0689d16..cce2064ea4c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionChangeNameActionBuilder builder) {
         ProductSelectionChangeNameAction productSelectionChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(productSelectionChangeNameAction).isInstanceOf(ProductSelectionChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionChangeNameAction.builder()
+        return new Object[][] { new Object[] { "name", ProductSelectionChangeNameAction.builder()
                 .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionDraftTest.java
index c5a03cb5318..2fca383a631 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionDraftTest.java
@@ -1,37 +1,32 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionDraftBuilder builder) {
         ProductSelectionDraft productSelectionDraft = builder.buildUnchecked();
         Assertions.assertThat(productSelectionDraft).isInstanceOf(ProductSelectionDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionDraft.builder().key("key") },
-                new Object[] { ProductSelectionDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductSelectionDraft.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { ProductSelectionDraft.builder()
-                        .mode(com.commercetools.api.models.product_selection.ProductSelectionMode
-                                .findEnum("Individual")) } };
+        return new Object[][] { new Object[] { "key", ProductSelectionDraft.builder().key("key") },
+                new Object[] { "name",
+                        ProductSelectionDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "custom",
+                        ProductSelectionDraft.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "mode",
+                        ProductSelectionDraft.builder()
+                                .mode(com.commercetools.api.models.product_selection.ProductSelectionMode
+                                        .findEnum("Individual")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionExcludeProductActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionExcludeProductActionTest.java
index 80c5bb1615e..dffad21edf4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionExcludeProductActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionExcludeProductActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionExcludeProductActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionExcludeProductActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionExcludeProductActionBuilder builder) {
         ProductSelectionExcludeProductAction productSelectionExcludeProductAction = builder.buildUnchecked();
         Assertions.assertThat(productSelectionExcludeProductAction)
                 .isInstanceOf(ProductSelectionExcludeProductAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionExcludeProductAction.builder()
-                        .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
-                new Object[] { ProductSelectionExcludeProductAction.builder()
+                new Object[] { "product",
+                        ProductSelectionExcludeProductAction.builder()
+                                .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
+                new Object[] { "variantExclusion", ProductSelectionExcludeProductAction.builder()
                         .variantExclusion(
                             new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionPagedQueryResponseTest.java
index 77da2701ddd..d2091baddc3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionPagedQueryResponseTest.java
@@ -3,37 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionPagedQueryResponseBuilder builder) {
         ProductSelectionPagedQueryResponse productSelectionPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(productSelectionPagedQueryResponse)
                 .isInstanceOf(ProductSelectionPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ProductSelectionPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ProductSelectionPagedQueryResponse.builder().count(2L) },
-                new Object[] { ProductSelectionPagedQueryResponse.builder().total(1L) },
-                new Object[] { ProductSelectionPagedQueryResponse.builder()
-                        .results(Collections.singletonList(
-                            new com.commercetools.api.models.product_selection.ProductSelectionImpl())) } };
+        return new Object[][] { new Object[] { "limit", ProductSelectionPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ProductSelectionPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ProductSelectionPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ProductSelectionPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        ProductSelectionPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.product_selection.ProductSelectionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionProductPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionProductPagedQueryResponseTest.java
index 579a27b4c2f..fd9df5ea904 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionProductPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionProductPagedQueryResponseTest.java
@@ -3,35 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionProductPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionProductPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionProductPagedQueryResponseBuilder builder) {
         ProductSelectionProductPagedQueryResponse productSelectionProductPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(productSelectionProductPagedQueryResponse)
                 .isInstanceOf(ProductSelectionProductPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionProductPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ProductSelectionProductPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ProductSelectionProductPagedQueryResponse.builder().count(2L) },
-                new Object[] { ProductSelectionProductPagedQueryResponse.builder().total(1L) },
-                new Object[] { ProductSelectionProductPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", ProductSelectionProductPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ProductSelectionProductPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ProductSelectionProductPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ProductSelectionProductPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", ProductSelectionProductPagedQueryResponse.builder()
                         .results(Collections.singletonList(
                             new com.commercetools.api.models.product_selection.AssignedProductReferenceImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionReferenceTest.java
index d637cd7d5a6..88e444d7d58 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionReferenceTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionReferenceBuilder builder) {
         ProductSelectionReference productSelectionReference = builder.buildUnchecked();
         Assertions.assertThat(productSelectionReference).isInstanceOf(ProductSelectionReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionReference.builder().id("id") },
-                new Object[] { ProductSelectionReference.builder()
+        return new Object[][] { new Object[] { "id", ProductSelectionReference.builder().id("id") },
+                new Object[] { "obj", ProductSelectionReference.builder()
                         .obj(new com.commercetools.api.models.product_selection.ProductSelectionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionRemoveProductActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionRemoveProductActionTest.java
index 2b11548097a..cb74be298c5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionRemoveProductActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionRemoveProductActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionRemoveProductActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionRemoveProductActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionRemoveProductActionBuilder builder) {
         ProductSelectionRemoveProductAction productSelectionRemoveProductAction = builder.buildUnchecked();
         Assertions.assertThat(productSelectionRemoveProductAction)
                 .isInstanceOf(ProductSelectionRemoveProductAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionRemoveProductAction.builder()
+        return new Object[][] { new Object[] { "product", ProductSelectionRemoveProductAction.builder()
                 .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionResourceIdentifierTest.java
index 257f7fc4b97..9ab63fa6e19 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionResourceIdentifierTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionResourceIdentifierBuilder builder) {
         ProductSelectionResourceIdentifier productSelectionResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(productSelectionResourceIdentifier)
                 .isInstanceOf(ProductSelectionResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionResourceIdentifier.builder().id("id") },
-                new Object[] { ProductSelectionResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", ProductSelectionResourceIdentifier.builder().id("id") },
+                new Object[] { "key", ProductSelectionResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetCustomFieldActionTest.java
index 1701ac8198f..6e4971d2077 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetCustomFieldActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionSetCustomFieldActionBuilder builder) {
         ProductSelectionSetCustomFieldAction productSelectionSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(productSelectionSetCustomFieldAction)
                 .isInstanceOf(ProductSelectionSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionSetCustomFieldAction.builder().name("name") },
-                new Object[] { ProductSelectionSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", ProductSelectionSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ProductSelectionSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetCustomTypeActionTest.java
index b0ab262bdfc..728c3664387 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetCustomTypeActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionSetCustomTypeActionBuilder builder) {
         ProductSelectionSetCustomTypeAction productSelectionSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(productSelectionSetCustomTypeAction)
                 .isInstanceOf(ProductSelectionSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ProductSelectionSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        ProductSelectionSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ProductSelectionSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetKeyActionTest.java
index b651a912c2f..a98076f0bf3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionSetKeyActionBuilder builder) {
         ProductSelectionSetKeyAction productSelectionSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(productSelectionSetKeyAction).isInstanceOf(ProductSelectionSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ProductSelectionSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetVariantExclusionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetVariantExclusionActionTest.java
index d56e394d0c3..469a7e64b92 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetVariantExclusionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetVariantExclusionActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionSetVariantExclusionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionSetVariantExclusionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionSetVariantExclusionActionBuilder builder) {
         ProductSelectionSetVariantExclusionAction productSelectionSetVariantExclusionAction = builder.buildUnchecked();
         Assertions.assertThat(productSelectionSetVariantExclusionAction)
                 .isInstanceOf(ProductSelectionSetVariantExclusionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionSetVariantExclusionAction.builder()
-                        .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
-                new Object[] { ProductSelectionSetVariantExclusionAction.builder()
+                new Object[] { "product",
+                        ProductSelectionSetVariantExclusionAction.builder()
+                                .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
+                new Object[] { "variantExclusion", ProductSelectionSetVariantExclusionAction.builder()
                         .variantExclusion(
                             new com.commercetools.api.models.product_selection.ProductVariantExclusionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetVariantSelectionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetVariantSelectionActionTest.java
index e5e6f02bd9c..e52bdf40e0f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetVariantSelectionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionSetVariantSelectionActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product_selection;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionSetVariantSelectionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionSetVariantSelectionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionSetVariantSelectionActionBuilder builder) {
         ProductSelectionSetVariantSelectionAction productSelectionSetVariantSelectionAction = builder.buildUnchecked();
         Assertions.assertThat(productSelectionSetVariantSelectionAction)
                 .isInstanceOf(ProductSelectionSetVariantSelectionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionSetVariantSelectionAction.builder()
-                        .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
-                new Object[] { ProductSelectionSetVariantSelectionAction.builder()
+                new Object[] { "product",
+                        ProductSelectionSetVariantSelectionAction.builder()
+                                .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
+                new Object[] { "variantSelection", ProductSelectionSetVariantSelectionAction.builder()
                         .variantSelection(
                             new com.commercetools.api.models.product_selection.ProductVariantSelectionImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionTest.java
index b5511fae671..5fe72ad789a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionTest.java
@@ -3,45 +3,42 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionBuilder builder) {
         ProductSelection productSelection = builder.buildUnchecked();
         Assertions.assertThat(productSelection).isInstanceOf(ProductSelection.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelection.builder().id("id") },
-                new Object[] { ProductSelection.builder().version(2L) },
-                new Object[] { ProductSelection.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductSelection.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductSelection.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", ProductSelection.builder().id("id") },
+                new Object[] { "version", ProductSelection.builder().version(2L) },
+                new Object[] { "createdAt",
+                        ProductSelection.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        ProductSelection.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        ProductSelection.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         ProductSelection.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { ProductSelection.builder().key("key") },
-                new Object[] { ProductSelection.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductSelection.builder().productCount(1) },
-                new Object[] { ProductSelection.builder()
-                        .mode(com.commercetools.api.models.product_selection.ProductSelectionMode
-                                .findEnum("Individual")) },
-                new Object[] {
+                new Object[] { "key", ProductSelection.builder().key("key") },
+                new Object[] { "name",
+                        ProductSelection.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "productCount", ProductSelection.builder().productCount(1) },
+                new Object[] { "mode",
+                        ProductSelection.builder()
+                                .mode(com.commercetools.api.models.product_selection.ProductSelectionMode
+                                        .findEnum("Individual")) },
+                new Object[] { "custom",
                         ProductSelection.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionUpdateTest.java
index 36a4fcb555c..d993cb3df26 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductSelectionUpdateTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionUpdateBuilder builder) {
         ProductSelectionUpdate productSelectionUpdate = builder.buildUnchecked();
         Assertions.assertThat(productSelectionUpdate).isInstanceOf(ProductSelectionUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionUpdate.builder().version(2L) },
-                new Object[] { ProductSelectionUpdate.builder()
+        return new Object[][] { new Object[] { "version", ProductSelectionUpdate.builder().version(2L) },
+                new Object[] { "actions", ProductSelectionUpdate.builder()
                         .actions(Collections.singletonList(
                             new com.commercetools.api.models.product_selection.ProductSelectionUpdateActionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductVariantExclusionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductVariantExclusionTest.java
index 5e92d2de837..71427f82ac7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductVariantExclusionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductVariantExclusionTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantExclusionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantExclusionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantExclusionBuilder builder) {
         ProductVariantExclusion productVariantExclusion = builder.buildUnchecked();
         Assertions.assertThat(productVariantExclusion).isInstanceOf(ProductVariantExclusion.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductVariantExclusion.builder().skus(Collections.singletonList("skus")) } };
+                new Object[] { "skus", ProductVariantExclusion.builder().skus(Collections.singletonList("skus")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductVariantSelectionIncludeAllExceptTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductVariantSelectionIncludeAllExceptTest.java
index 672010fb4eb..6fb4fbf66b2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductVariantSelectionIncludeAllExceptTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductVariantSelectionIncludeAllExceptTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantSelectionIncludeAllExceptTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantSelectionIncludeAllExceptBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantSelectionIncludeAllExceptBuilder builder) {
         ProductVariantSelectionIncludeAllExcept productVariantSelectionIncludeAllExcept = builder.buildUnchecked();
         Assertions.assertThat(productVariantSelectionIncludeAllExcept)
                 .isInstanceOf(ProductVariantSelectionIncludeAllExcept.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "skus",
                 ProductVariantSelectionIncludeAllExcept.builder().skus(Collections.singletonList("skus")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductVariantSelectionIncludeOnlyTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductVariantSelectionIncludeOnlyTest.java
index 4bb0e60521f..f6fbb34a53c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductVariantSelectionIncludeOnlyTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductVariantSelectionIncludeOnlyTest.java
@@ -3,32 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantSelectionIncludeOnlyTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantSelectionIncludeOnlyBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantSelectionIncludeOnlyBuilder builder) {
         ProductVariantSelectionIncludeOnly productVariantSelectionIncludeOnly = builder.buildUnchecked();
         Assertions.assertThat(productVariantSelectionIncludeOnly)
                 .isInstanceOf(ProductVariantSelectionIncludeOnly.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { ProductVariantSelectionIncludeOnly.builder().skus(Collections.singletonList("skus")) } };
+        return new Object[][] { new Object[] { "skus",
+                ProductVariantSelectionIncludeOnly.builder().skus(Collections.singletonList("skus")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductsInStorePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductsInStorePagedQueryResponseTest.java
index 4abb4e91db0..0bc28f2cb6c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductsInStorePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_selection/ProductsInStorePagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductsInStorePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductsInStorePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductsInStorePagedQueryResponseBuilder builder) {
         ProductsInStorePagedQueryResponse productsInStorePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(productsInStorePagedQueryResponse).isInstanceOf(ProductsInStorePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductsInStorePagedQueryResponse.builder().limit(7L) },
-                new Object[] { ProductsInStorePagedQueryResponse.builder().offset(3L) },
-                new Object[] { ProductsInStorePagedQueryResponse.builder().count(2L) },
-                new Object[] { ProductsInStorePagedQueryResponse.builder().total(1L) },
-                new Object[] { ProductsInStorePagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", ProductsInStorePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ProductsInStorePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ProductsInStorePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ProductsInStorePagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", ProductsInStorePagedQueryResponse.builder()
                         .results(Collections.singletonList(
                             new com.commercetools.api.models.product_selection.ProductSelectionAssignmentImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAddAssetActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAddAssetActionTest.java
index 59892fcce91..e7cae4f07ea 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAddAssetActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAddAssetActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringAddAssetActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringAddAssetActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringAddAssetActionBuilder builder) {
         ProductTailoringAddAssetAction productTailoringAddAssetAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringAddAssetAction).isInstanceOf(ProductTailoringAddAssetAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringAddAssetAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringAddAssetAction.builder().sku("sku") },
-                new Object[] { ProductTailoringAddAssetAction.builder().staged(true) },
-                new Object[] { ProductTailoringAddAssetAction.builder()
-                        .asset(new com.commercetools.api.models.common.AssetDraftImpl()) },
-                new Object[] { ProductTailoringAddAssetAction.builder().position(4) } };
+        return new Object[][] { new Object[] { "variantId", ProductTailoringAddAssetAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringAddAssetAction.builder().sku("sku") },
+                new Object[] { "staged", ProductTailoringAddAssetAction.builder().staged(true) },
+                new Object[] { "asset",
+                        ProductTailoringAddAssetAction.builder()
+                                .asset(new com.commercetools.api.models.common.AssetDraftImpl()) },
+                new Object[] { "position", ProductTailoringAddAssetAction.builder().position(4) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAddExternalImageActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAddExternalImageActionTest.java
index 63c998a90bf..03bc3b04e05 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAddExternalImageActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAddExternalImageActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringAddExternalImageActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringAddExternalImageActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringAddExternalImageActionBuilder builder) {
         ProductTailoringAddExternalImageAction productTailoringAddExternalImageAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringAddExternalImageAction)
                 .isInstanceOf(ProductTailoringAddExternalImageAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringAddExternalImageAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringAddExternalImageAction.builder().sku("sku") },
-                new Object[] { ProductTailoringAddExternalImageAction.builder()
-                        .image(new com.commercetools.api.models.common.ImageImpl()) },
-                new Object[] { ProductTailoringAddExternalImageAction.builder().staged(true) } };
+        return new Object[][] {
+                new Object[] { "variantId", ProductTailoringAddExternalImageAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringAddExternalImageAction.builder().sku("sku") },
+                new Object[] { "image",
+                        ProductTailoringAddExternalImageAction.builder()
+                                .image(new com.commercetools.api.models.common.ImageImpl()) },
+                new Object[] { "staged", ProductTailoringAddExternalImageAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAddVariantActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAddVariantActionTest.java
index 7e4b158ef96..36c33a848c9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAddVariantActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAddVariantActionTest.java
@@ -3,39 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringAddVariantActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringAddVariantActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringAddVariantActionBuilder builder) {
         ProductTailoringAddVariantAction productTailoringAddVariantAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringAddVariantAction).isInstanceOf(ProductTailoringAddVariantAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringAddVariantAction.builder().id(2L) },
-                new Object[] { ProductTailoringAddVariantAction.builder().sku("sku") },
-                new Object[] { ProductTailoringAddVariantAction.builder()
+        return new Object[][] { new Object[] { "id", ProductTailoringAddVariantAction.builder().id(2L) },
+                new Object[] { "sku", ProductTailoringAddVariantAction.builder().sku("sku") },
+                new Object[] { "images", ProductTailoringAddVariantAction.builder()
                         .images(Collections.singletonList(new com.commercetools.api.models.common.ImageImpl())) },
-                new Object[] { ProductTailoringAddVariantAction.builder()
-                        .assets(Collections.singletonList(new com.commercetools.api.models.common.AssetDraftImpl())) },
-                new Object[] { ProductTailoringAddVariantAction.builder()
+                new Object[] { "assets",
+                        ProductTailoringAddVariantAction.builder()
+                                .assets(Collections
+                                        .singletonList(new com.commercetools.api.models.common.AssetDraftImpl())) },
+                new Object[] { "attributes", ProductTailoringAddVariantAction.builder()
                         .attributes(Collections.singletonList(
                             new com.commercetools.api.models.product_tailoring.ProductTailoringAttributeImpl())) },
-                new Object[] { ProductTailoringAddVariantAction.builder().staged(true) } };
+                new Object[] { "staged", ProductTailoringAddVariantAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAttributeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAttributeTest.java
index e16213ec163..d605fa5257a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringAttributeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringAttributeBuilder builder) {
         ProductTailoringAttribute productTailoringAttribute = builder.buildUnchecked();
         Assertions.assertThat(productTailoringAttribute).isInstanceOf(ProductTailoringAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringAttribute.builder().name("name") },
-                new Object[] { ProductTailoringAttribute.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", ProductTailoringAttribute.builder().name("name") },
+                new Object[] { "value", ProductTailoringAttribute.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringChangeAssetNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringChangeAssetNameActionTest.java
index 51601490ba8..1ec71278e2f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringChangeAssetNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringChangeAssetNameActionTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringChangeAssetNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringChangeAssetNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringChangeAssetNameActionBuilder builder) {
         ProductTailoringChangeAssetNameAction productTailoringChangeAssetNameAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringChangeAssetNameAction)
                 .isInstanceOf(ProductTailoringChangeAssetNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringChangeAssetNameAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringChangeAssetNameAction.builder().sku("sku") },
-                new Object[] { ProductTailoringChangeAssetNameAction.builder().staged(true) },
-                new Object[] { ProductTailoringChangeAssetNameAction.builder().assetId("assetId") },
-                new Object[] { ProductTailoringChangeAssetNameAction.builder().assetKey("assetKey") },
-                new Object[] { ProductTailoringChangeAssetNameAction.builder()
+        return new Object[][] {
+                new Object[] { "variantId", ProductTailoringChangeAssetNameAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringChangeAssetNameAction.builder().sku("sku") },
+                new Object[] { "staged", ProductTailoringChangeAssetNameAction.builder().staged(true) },
+                new Object[] { "assetId", ProductTailoringChangeAssetNameAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductTailoringChangeAssetNameAction.builder().assetKey("assetKey") },
+                new Object[] { "name", ProductTailoringChangeAssetNameAction.builder()
                         .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringChangeAssetOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringChangeAssetOrderActionTest.java
index fb0e59023fa..2d914762466 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringChangeAssetOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringChangeAssetOrderActionTest.java
@@ -3,34 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringChangeAssetOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringChangeAssetOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringChangeAssetOrderActionBuilder builder) {
         ProductTailoringChangeAssetOrderAction productTailoringChangeAssetOrderAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringChangeAssetOrderAction)
                 .isInstanceOf(ProductTailoringChangeAssetOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringChangeAssetOrderAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringChangeAssetOrderAction.builder().sku("sku") },
-                new Object[] { ProductTailoringChangeAssetOrderAction.builder().staged(true) },
-                new Object[] { ProductTailoringChangeAssetOrderAction.builder()
+        return new Object[][] {
+                new Object[] { "variantId", ProductTailoringChangeAssetOrderAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringChangeAssetOrderAction.builder().sku("sku") },
+                new Object[] { "staged", ProductTailoringChangeAssetOrderAction.builder().staged(true) },
+                new Object[] { "assetOrder", ProductTailoringChangeAssetOrderAction.builder()
                         .assetOrder(Collections.singletonList("assetOrder")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringDataTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringDataTest.java
index b6271c8218d..7f95423f056 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringDataTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringDataTest.java
@@ -3,43 +3,41 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringDataBuilder builder) {
         ProductTailoringData productTailoringData = builder.buildUnchecked();
         Assertions.assertThat(productTailoringData).isInstanceOf(ProductTailoringData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringData.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringData.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringData.builder()
-                        .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringData.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringData.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringData.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringData.builder()
+                new Object[] { "name",
+                        ProductTailoringData.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
+                        ProductTailoringData.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaTitle",
+                        ProductTailoringData.builder()
+                                .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        ProductTailoringData.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        ProductTailoringData.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "slug",
+                        ProductTailoringData.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "variants", ProductTailoringData.builder()
                         .variants(Collections.singletonList(
                             new com.commercetools.api.models.product_tailoring.ProductVariantTailoringImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringDraftTest.java
index 6472b68eb7c..ecfd9fdc38d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringDraftTest.java
@@ -3,48 +3,48 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringDraftBuilder builder) {
         ProductTailoringDraft productTailoringDraft = builder.buildUnchecked();
         Assertions.assertThat(productTailoringDraft).isInstanceOf(ProductTailoringDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringDraft.builder().key("key") },
-                new Object[] { ProductTailoringDraft.builder()
-                        .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) },
-                new Object[] { ProductTailoringDraft.builder()
-                        .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
-                new Object[] { ProductTailoringDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringDraft.builder()
-                        .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringDraft.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringDraft.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringDraft.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringDraft.builder().publish(true) },
-                new Object[] { ProductTailoringDraft.builder()
+        return new Object[][] { new Object[] { "key", ProductTailoringDraft.builder().key("key") },
+                new Object[] { "store",
+                        ProductTailoringDraft.builder()
+                                .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) },
+                new Object[] { "product",
+                        ProductTailoringDraft.builder()
+                                .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
+                new Object[] { "name",
+                        ProductTailoringDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
+                        ProductTailoringDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaTitle",
+                        ProductTailoringDraft.builder()
+                                .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        ProductTailoringDraft.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        ProductTailoringDraft.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "slug",
+                        ProductTailoringDraft.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "publish", ProductTailoringDraft.builder().publish(true) },
+                new Object[] { "variants", ProductTailoringDraft.builder()
                         .variants(Collections.singletonList(
                             new com.commercetools.api.models.product_tailoring.ProductVariantTailoringDraftImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringInStoreDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringInStoreDraftTest.java
index 1105e72d175..03236e0e6a7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringInStoreDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringInStoreDraftTest.java
@@ -3,46 +3,45 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringInStoreDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringInStoreDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringInStoreDraftBuilder builder) {
         ProductTailoringInStoreDraft productTailoringInStoreDraft = builder.buildUnchecked();
         Assertions.assertThat(productTailoringInStoreDraft).isInstanceOf(ProductTailoringInStoreDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringInStoreDraft.builder().key("key") },
-                new Object[] { ProductTailoringInStoreDraft.builder()
-                        .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
-                new Object[] { ProductTailoringInStoreDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringInStoreDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringInStoreDraft.builder()
-                        .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringInStoreDraft.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringInStoreDraft.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringInStoreDraft.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringInStoreDraft.builder().publish(true) },
-                new Object[] { ProductTailoringInStoreDraft.builder()
+        return new Object[][] { new Object[] { "key", ProductTailoringInStoreDraft.builder().key("key") },
+                new Object[] { "product",
+                        ProductTailoringInStoreDraft.builder()
+                                .product(new com.commercetools.api.models.product.ProductResourceIdentifierImpl()) },
+                new Object[] { "name",
+                        ProductTailoringInStoreDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
+                        ProductTailoringInStoreDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaTitle",
+                        ProductTailoringInStoreDraft.builder()
+                                .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        ProductTailoringInStoreDraft.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        ProductTailoringInStoreDraft.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "slug",
+                        ProductTailoringInStoreDraft.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "publish", ProductTailoringInStoreDraft.builder().publish(true) },
+                new Object[] { "variants", ProductTailoringInStoreDraft.builder()
                         .variants(Collections.singletonList(
                             new com.commercetools.api.models.product_tailoring.ProductVariantTailoringDraftImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringMoveImageToPositionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringMoveImageToPositionActionTest.java
index 9cbda089d46..0d3fc5ea0eb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringMoveImageToPositionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringMoveImageToPositionActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringMoveImageToPositionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringMoveImageToPositionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringMoveImageToPositionActionBuilder builder) {
         ProductTailoringMoveImageToPositionAction productTailoringMoveImageToPositionAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringMoveImageToPositionAction)
                 .isInstanceOf(ProductTailoringMoveImageToPositionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringMoveImageToPositionAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringMoveImageToPositionAction.builder().sku("sku") },
-                new Object[] { ProductTailoringMoveImageToPositionAction.builder().imageUrl("imageUrl") },
-                new Object[] { ProductTailoringMoveImageToPositionAction.builder().position(4L) },
-                new Object[] { ProductTailoringMoveImageToPositionAction.builder().staged(true) } };
+        return new Object[][] {
+                new Object[] { "variantId", ProductTailoringMoveImageToPositionAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringMoveImageToPositionAction.builder().sku("sku") },
+                new Object[] { "imageUrl", ProductTailoringMoveImageToPositionAction.builder().imageUrl("imageUrl") },
+                new Object[] { "position", ProductTailoringMoveImageToPositionAction.builder().position(4L) },
+                new Object[] { "staged", ProductTailoringMoveImageToPositionAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringPagedQueryResponseTest.java
index e1a18e60bb4..f4ab53face4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringPagedQueryResponseTest.java
@@ -3,37 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringPagedQueryResponseBuilder builder) {
         ProductTailoringPagedQueryResponse productTailoringPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(productTailoringPagedQueryResponse)
                 .isInstanceOf(ProductTailoringPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ProductTailoringPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ProductTailoringPagedQueryResponse.builder().count(2L) },
-                new Object[] { ProductTailoringPagedQueryResponse.builder().total(1L) },
-                new Object[] { ProductTailoringPagedQueryResponse.builder()
-                        .results(Collections.singletonList(
-                            new com.commercetools.api.models.product_tailoring.ProductTailoringImpl())) } };
+        return new Object[][] { new Object[] { "limit", ProductTailoringPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ProductTailoringPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ProductTailoringPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ProductTailoringPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        ProductTailoringPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.product_tailoring.ProductTailoringImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringPublishActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringPublishActionTest.java
index 44af57199d8..78e36d3eef6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringPublishActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringPublishActionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringPublishActionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringReferenceTest.java
index 313951ee384..4911e77ad3e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringReferenceTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringReferenceBuilder builder) {
         ProductTailoringReference productTailoringReference = builder.buildUnchecked();
         Assertions.assertThat(productTailoringReference).isInstanceOf(ProductTailoringReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringReference.builder().id("id") },
-                new Object[] { ProductTailoringReference.builder()
+        return new Object[][] { new Object[] { "id", ProductTailoringReference.builder().id("id") },
+                new Object[] { "obj", ProductTailoringReference.builder()
                         .obj(new com.commercetools.api.models.product_tailoring.ProductTailoringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringRemoveAssetActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringRemoveAssetActionTest.java
index 8ec2507b640..7b89d95fea9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringRemoveAssetActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringRemoveAssetActionTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringRemoveAssetActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringRemoveAssetActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringRemoveAssetActionBuilder builder) {
         ProductTailoringRemoveAssetAction productTailoringRemoveAssetAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringRemoveAssetAction).isInstanceOf(ProductTailoringRemoveAssetAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringRemoveAssetAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringRemoveAssetAction.builder().sku("sku") },
-                new Object[] { ProductTailoringRemoveAssetAction.builder().staged(true) },
-                new Object[] { ProductTailoringRemoveAssetAction.builder().assetId("assetId") },
-                new Object[] { ProductTailoringRemoveAssetAction.builder().assetKey("assetKey") } };
+        return new Object[][] { new Object[] { "variantId", ProductTailoringRemoveAssetAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringRemoveAssetAction.builder().sku("sku") },
+                new Object[] { "staged", ProductTailoringRemoveAssetAction.builder().staged(true) },
+                new Object[] { "assetId", ProductTailoringRemoveAssetAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductTailoringRemoveAssetAction.builder().assetKey("assetKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringRemoveImageActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringRemoveImageActionTest.java
index 7f4b7b4cae4..c2f8e9d596b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringRemoveImageActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringRemoveImageActionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringRemoveImageActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringRemoveImageActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringRemoveImageActionBuilder builder) {
         ProductTailoringRemoveImageAction productTailoringRemoveImageAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringRemoveImageAction).isInstanceOf(ProductTailoringRemoveImageAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringRemoveImageAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringRemoveImageAction.builder().sku("sku") },
-                new Object[] { ProductTailoringRemoveImageAction.builder().imageUrl("imageUrl") },
-                new Object[] { ProductTailoringRemoveImageAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "variantId", ProductTailoringRemoveImageAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringRemoveImageAction.builder().sku("sku") },
+                new Object[] { "imageUrl", ProductTailoringRemoveImageAction.builder().imageUrl("imageUrl") },
+                new Object[] { "staged", ProductTailoringRemoveImageAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringRemoveVariantActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringRemoveVariantActionTest.java
index b9bbadb1886..34d2ce64463 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringRemoveVariantActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringRemoveVariantActionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringRemoveVariantActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringRemoveVariantActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringRemoveVariantActionBuilder builder) {
         ProductTailoringRemoveVariantAction productTailoringRemoveVariantAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringRemoveVariantAction)
                 .isInstanceOf(ProductTailoringRemoveVariantAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringRemoveVariantAction.builder().id(2L) },
-                new Object[] { ProductTailoringRemoveVariantAction.builder().sku("sku") },
-                new Object[] { ProductTailoringRemoveVariantAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "id", ProductTailoringRemoveVariantAction.builder().id(2L) },
+                new Object[] { "sku", ProductTailoringRemoveVariantAction.builder().sku("sku") },
+                new Object[] { "staged", ProductTailoringRemoveVariantAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringResourceIdentifierTest.java
index 4a772c45b89..a310218a18f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringResourceIdentifierTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringResourceIdentifierBuilder builder) {
         ProductTailoringResourceIdentifier productTailoringResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(productTailoringResourceIdentifier)
                 .isInstanceOf(ProductTailoringResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringResourceIdentifier.builder().id("id") },
-                new Object[] { ProductTailoringResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", ProductTailoringResourceIdentifier.builder().id("id") },
+                new Object[] { "key", ProductTailoringResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetCustomFieldActionTest.java
index c2e1ef30857..1aefc0846b5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetCustomFieldActionTest.java
@@ -1,37 +1,30 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetAssetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetAssetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetAssetCustomFieldActionBuilder builder) {
         ProductTailoringSetAssetCustomFieldAction productTailoringSetAssetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetAssetCustomFieldAction)
                 .isInstanceOf(ProductTailoringSetAssetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringSetAssetCustomFieldAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringSetAssetCustomFieldAction.builder().sku("sku") },
-                new Object[] { ProductTailoringSetAssetCustomFieldAction.builder().staged(true) },
-                new Object[] { ProductTailoringSetAssetCustomFieldAction.builder().assetId("assetId") },
-                new Object[] { ProductTailoringSetAssetCustomFieldAction.builder().assetKey("assetKey") },
-                new Object[] { ProductTailoringSetAssetCustomFieldAction.builder().name("name") },
-                new Object[] { ProductTailoringSetAssetCustomFieldAction.builder().value("value") } };
+        return new Object[][] {
+                new Object[] { "variantId", ProductTailoringSetAssetCustomFieldAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringSetAssetCustomFieldAction.builder().sku("sku") },
+                new Object[] { "staged", ProductTailoringSetAssetCustomFieldAction.builder().staged(true) },
+                new Object[] { "assetId", ProductTailoringSetAssetCustomFieldAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductTailoringSetAssetCustomFieldAction.builder().assetKey("assetKey") },
+                new Object[] { "name", ProductTailoringSetAssetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ProductTailoringSetAssetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetCustomTypeActionTest.java
index 0ffcf4f11c8..94ae0839d69 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetCustomTypeActionTest.java
@@ -1,38 +1,32 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetAssetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetAssetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetAssetCustomTypeActionBuilder builder) {
         ProductTailoringSetAssetCustomTypeAction productTailoringSetAssetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetAssetCustomTypeAction)
                 .isInstanceOf(ProductTailoringSetAssetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringSetAssetCustomTypeAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringSetAssetCustomTypeAction.builder().sku("sku") },
-                new Object[] { ProductTailoringSetAssetCustomTypeAction.builder().staged(true) },
-                new Object[] { ProductTailoringSetAssetCustomTypeAction.builder().assetId("assetId") },
-                new Object[] { ProductTailoringSetAssetCustomTypeAction.builder().assetKey("assetKey") },
-                new Object[] { ProductTailoringSetAssetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ProductTailoringSetAssetCustomTypeAction.builder()
+        return new Object[][] {
+                new Object[] { "variantId", ProductTailoringSetAssetCustomTypeAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringSetAssetCustomTypeAction.builder().sku("sku") },
+                new Object[] { "staged", ProductTailoringSetAssetCustomTypeAction.builder().staged(true) },
+                new Object[] { "assetId", ProductTailoringSetAssetCustomTypeAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductTailoringSetAssetCustomTypeAction.builder().assetKey("assetKey") },
+                new Object[] { "type",
+                        ProductTailoringSetAssetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ProductTailoringSetAssetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetDescriptionActionTest.java
index 755e51fecfe..dd3a64b2aba 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetDescriptionActionTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetAssetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetAssetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetAssetDescriptionActionBuilder builder) {
         ProductTailoringSetAssetDescriptionAction productTailoringSetAssetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetAssetDescriptionAction)
                 .isInstanceOf(ProductTailoringSetAssetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringSetAssetDescriptionAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringSetAssetDescriptionAction.builder().sku("sku") },
-                new Object[] { ProductTailoringSetAssetDescriptionAction.builder().staged(true) },
-                new Object[] { ProductTailoringSetAssetDescriptionAction.builder().assetId("assetId") },
-                new Object[] { ProductTailoringSetAssetDescriptionAction.builder().assetKey("assetKey") },
-                new Object[] { ProductTailoringSetAssetDescriptionAction.builder()
+        return new Object[][] {
+                new Object[] { "variantId", ProductTailoringSetAssetDescriptionAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringSetAssetDescriptionAction.builder().sku("sku") },
+                new Object[] { "staged", ProductTailoringSetAssetDescriptionAction.builder().staged(true) },
+                new Object[] { "assetId", ProductTailoringSetAssetDescriptionAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductTailoringSetAssetDescriptionAction.builder().assetKey("assetKey") },
+                new Object[] { "description", ProductTailoringSetAssetDescriptionAction.builder()
                         .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetKeyActionTest.java
index 366a410f695..34b529718ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetKeyActionTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetAssetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetAssetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetAssetKeyActionBuilder builder) {
         ProductTailoringSetAssetKeyAction productTailoringSetAssetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetAssetKeyAction).isInstanceOf(ProductTailoringSetAssetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringSetAssetKeyAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringSetAssetKeyAction.builder().sku("sku") },
-                new Object[] { ProductTailoringSetAssetKeyAction.builder().staged(true) },
-                new Object[] { ProductTailoringSetAssetKeyAction.builder().assetId("assetId") },
-                new Object[] { ProductTailoringSetAssetKeyAction.builder().assetKey("assetKey") } };
+        return new Object[][] { new Object[] { "variantId", ProductTailoringSetAssetKeyAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringSetAssetKeyAction.builder().sku("sku") },
+                new Object[] { "staged", ProductTailoringSetAssetKeyAction.builder().staged(true) },
+                new Object[] { "assetId", ProductTailoringSetAssetKeyAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductTailoringSetAssetKeyAction.builder().assetKey("assetKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetSourcesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetSourcesActionTest.java
index 2cef43726a3..4e67184e42c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetSourcesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetSourcesActionTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetAssetSourcesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetAssetSourcesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetAssetSourcesActionBuilder builder) {
         ProductTailoringSetAssetSourcesAction productTailoringSetAssetSourcesAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetAssetSourcesAction)
                 .isInstanceOf(ProductTailoringSetAssetSourcesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringSetAssetSourcesAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringSetAssetSourcesAction.builder().sku("sku") },
-                new Object[] { ProductTailoringSetAssetSourcesAction.builder().staged(true) },
-                new Object[] { ProductTailoringSetAssetSourcesAction.builder().assetId("assetId") },
-                new Object[] { ProductTailoringSetAssetSourcesAction.builder().assetKey("assetKey") },
-                new Object[] { ProductTailoringSetAssetSourcesAction.builder()
+        return new Object[][] {
+                new Object[] { "variantId", ProductTailoringSetAssetSourcesAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringSetAssetSourcesAction.builder().sku("sku") },
+                new Object[] { "staged", ProductTailoringSetAssetSourcesAction.builder().staged(true) },
+                new Object[] { "assetId", ProductTailoringSetAssetSourcesAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductTailoringSetAssetSourcesAction.builder().assetKey("assetKey") },
+                new Object[] { "sources", ProductTailoringSetAssetSourcesAction.builder()
                         .sources(
                             Collections.singletonList(new com.commercetools.api.models.common.AssetSourceImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetTagsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetTagsActionTest.java
index 60faeed6ae4..9741068717f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetTagsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAssetTagsActionTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetAssetTagsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetAssetTagsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetAssetTagsActionBuilder builder) {
         ProductTailoringSetAssetTagsAction productTailoringSetAssetTagsAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetAssetTagsAction)
                 .isInstanceOf(ProductTailoringSetAssetTagsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringSetAssetTagsAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringSetAssetTagsAction.builder().sku("sku") },
-                new Object[] { ProductTailoringSetAssetTagsAction.builder().staged(true) },
-                new Object[] { ProductTailoringSetAssetTagsAction.builder().assetId("assetId") },
-                new Object[] { ProductTailoringSetAssetTagsAction.builder().assetKey("assetKey") },
-                new Object[] { ProductTailoringSetAssetTagsAction.builder().tags(Collections.singletonList("tags")) } };
+        return new Object[][] {
+                new Object[] { "variantId", ProductTailoringSetAssetTagsAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringSetAssetTagsAction.builder().sku("sku") },
+                new Object[] { "staged", ProductTailoringSetAssetTagsAction.builder().staged(true) },
+                new Object[] { "assetId", ProductTailoringSetAssetTagsAction.builder().assetId("assetId") },
+                new Object[] { "assetKey", ProductTailoringSetAssetTagsAction.builder().assetKey("assetKey") },
+                new Object[] { "tags",
+                        ProductTailoringSetAssetTagsAction.builder().tags(Collections.singletonList("tags")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAttributeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAttributeActionTest.java
index 696991cd496..85d24093700 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAttributeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAttributeActionTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetAttributeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetAttributeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetAttributeActionBuilder builder) {
         ProductTailoringSetAttributeAction productTailoringSetAttributeAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetAttributeAction)
                 .isInstanceOf(ProductTailoringSetAttributeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringSetAttributeAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringSetAttributeAction.builder().sku("sku") },
-                new Object[] { ProductTailoringSetAttributeAction.builder().name("name") },
-                new Object[] { ProductTailoringSetAttributeAction.builder().value("value") },
-                new Object[] { ProductTailoringSetAttributeAction.builder().staged(true) } };
+        return new Object[][] {
+                new Object[] { "variantId", ProductTailoringSetAttributeAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringSetAttributeAction.builder().sku("sku") },
+                new Object[] { "name", ProductTailoringSetAttributeAction.builder().name("name") },
+                new Object[] { "value", ProductTailoringSetAttributeAction.builder().value("value") },
+                new Object[] { "staged", ProductTailoringSetAttributeAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAttributeInAllVariantsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAttributeInAllVariantsActionTest.java
index 5d9c0e284aa..467cd32bdc6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAttributeInAllVariantsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetAttributeInAllVariantsActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetAttributeInAllVariantsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetAttributeInAllVariantsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetAttributeInAllVariantsActionBuilder builder) {
         ProductTailoringSetAttributeInAllVariantsAction productTailoringSetAttributeInAllVariantsAction = builder
                 .buildUnchecked();
         Assertions.assertThat(productTailoringSetAttributeInAllVariantsAction)
                 .isInstanceOf(ProductTailoringSetAttributeInAllVariantsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringSetAttributeInAllVariantsAction.builder().name("name") },
-                new Object[] { ProductTailoringSetAttributeInAllVariantsAction.builder().value("value") },
-                new Object[] { ProductTailoringSetAttributeInAllVariantsAction.builder().staged(true) } };
+        return new Object[][] {
+                new Object[] { "name", ProductTailoringSetAttributeInAllVariantsAction.builder().name("name") },
+                new Object[] { "value", ProductTailoringSetAttributeInAllVariantsAction.builder().value("value") },
+                new Object[] { "staged", ProductTailoringSetAttributeInAllVariantsAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetDescriptionActionTest.java
index e2baa829e16..b71402ec540 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetDescriptionActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetDescriptionActionBuilder builder) {
         ProductTailoringSetDescriptionAction productTailoringSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetDescriptionAction)
                 .isInstanceOf(ProductTailoringSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringSetDescriptionAction.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringSetDescriptionAction.builder().staged(true) } };
+                new Object[] { "description",
+                        ProductTailoringSetDescriptionAction.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductTailoringSetDescriptionAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetExternalImagesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetExternalImagesActionTest.java
index c4df4aa3dbc..5c60ab77399 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetExternalImagesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetExternalImagesActionTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetExternalImagesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetExternalImagesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetExternalImagesActionBuilder builder) {
         ProductTailoringSetExternalImagesAction productTailoringSetExternalImagesAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetExternalImagesAction)
                 .isInstanceOf(ProductTailoringSetExternalImagesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringSetExternalImagesAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringSetExternalImagesAction.builder().sku("sku") },
-                new Object[] { ProductTailoringSetExternalImagesAction.builder()
+        return new Object[][] {
+                new Object[] { "variantId", ProductTailoringSetExternalImagesAction.builder().variantId(5L) },
+                new Object[] { "sku", ProductTailoringSetExternalImagesAction.builder().sku("sku") },
+                new Object[] { "images", ProductTailoringSetExternalImagesAction.builder()
                         .images(Collections.singletonList(new com.commercetools.api.models.common.ImageImpl())) },
-                new Object[] { ProductTailoringSetExternalImagesAction.builder().staged(true) } };
+                new Object[] { "staged", ProductTailoringSetExternalImagesAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetImageLabelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetImageLabelActionTest.java
index 39f58f52671..bfe191ae115 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetImageLabelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetImageLabelActionTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetImageLabelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetImageLabelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetImageLabelActionBuilder builder) {
         ProductTailoringSetImageLabelAction productTailoringSetImageLabelAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetImageLabelAction)
                 .isInstanceOf(ProductTailoringSetImageLabelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoringSetImageLabelAction.builder().sku("sku") },
-                new Object[] { ProductTailoringSetImageLabelAction.builder().variantId(5L) },
-                new Object[] { ProductTailoringSetImageLabelAction.builder().imageUrl("imageUrl") },
-                new Object[] { ProductTailoringSetImageLabelAction.builder().label("label") },
-                new Object[] { ProductTailoringSetImageLabelAction.builder().staged(true) } };
+        return new Object[][] { new Object[] { "sku", ProductTailoringSetImageLabelAction.builder().sku("sku") },
+                new Object[] { "variantId", ProductTailoringSetImageLabelAction.builder().variantId(5L) },
+                new Object[] { "imageUrl", ProductTailoringSetImageLabelAction.builder().imageUrl("imageUrl") },
+                new Object[] { "label", ProductTailoringSetImageLabelAction.builder().label("label") },
+                new Object[] { "staged", ProductTailoringSetImageLabelAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaAttributesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaAttributesActionTest.java
index 572f1b004b4..9b5c50e2edc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaAttributesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaAttributesActionTest.java
@@ -1,38 +1,33 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetMetaAttributesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetMetaAttributesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetMetaAttributesActionBuilder builder) {
         ProductTailoringSetMetaAttributesAction productTailoringSetMetaAttributesAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetMetaAttributesAction)
                 .isInstanceOf(ProductTailoringSetMetaAttributesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringSetMetaAttributesAction.builder()
-                        .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringSetMetaAttributesAction.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringSetMetaAttributesAction.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringSetMetaAttributesAction.builder().staged(true) } };
+                new Object[] { "metaTitle",
+                        ProductTailoringSetMetaAttributesAction.builder()
+                                .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        ProductTailoringSetMetaAttributesAction.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        ProductTailoringSetMetaAttributesAction.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductTailoringSetMetaAttributesAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaDescriptionActionTest.java
index 089b7caec79..f1b9d8e54ca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaDescriptionActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetMetaDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetMetaDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetMetaDescriptionActionBuilder builder) {
         ProductTailoringSetMetaDescriptionAction productTailoringSetMetaDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetMetaDescriptionAction)
                 .isInstanceOf(ProductTailoringSetMetaDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringSetMetaDescriptionAction.builder()
-                        .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringSetMetaDescriptionAction.builder().staged(true) } };
+                new Object[] { "metaDescription",
+                        ProductTailoringSetMetaDescriptionAction.builder()
+                                .metaDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductTailoringSetMetaDescriptionAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaKeywordsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaKeywordsActionTest.java
index 16756821156..07bfec8dad4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaKeywordsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaKeywordsActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetMetaKeywordsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetMetaKeywordsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetMetaKeywordsActionBuilder builder) {
         ProductTailoringSetMetaKeywordsAction productTailoringSetMetaKeywordsAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetMetaKeywordsAction)
                 .isInstanceOf(ProductTailoringSetMetaKeywordsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringSetMetaKeywordsAction.builder()
-                        .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringSetMetaKeywordsAction.builder().staged(true) } };
+                new Object[] { "metaKeywords",
+                        ProductTailoringSetMetaKeywordsAction.builder()
+                                .metaKeywords(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductTailoringSetMetaKeywordsAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaTitleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaTitleActionTest.java
index 9c0da97fcc7..fdba2829b83 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaTitleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetMetaTitleActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetMetaTitleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetMetaTitleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetMetaTitleActionBuilder builder) {
         ProductTailoringSetMetaTitleAction productTailoringSetMetaTitleAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetMetaTitleAction)
                 .isInstanceOf(ProductTailoringSetMetaTitleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringSetMetaTitleAction.builder()
-                        .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringSetMetaTitleAction.builder().staged(true) } };
+                new Object[] { "metaTitle",
+                        ProductTailoringSetMetaTitleAction.builder()
+                                .metaTitle(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductTailoringSetMetaTitleAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetNameActionTest.java
index 0a315785c06..82328640219 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetNameActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetNameActionBuilder builder) {
         ProductTailoringSetNameAction productTailoringSetNameAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetNameAction).isInstanceOf(ProductTailoringSetNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringSetNameAction.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringSetNameAction.builder().staged(true) } };
+                new Object[] { "name",
+                        ProductTailoringSetNameAction.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductTailoringSetNameAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetSlugActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetSlugActionTest.java
index f3578d6c4b0..e0087499431 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetSlugActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringSetSlugActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringSetSlugActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringSetSlugActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringSetSlugActionBuilder builder) {
         ProductTailoringSetSlugAction productTailoringSetSlugAction = builder.buildUnchecked();
         Assertions.assertThat(productTailoringSetSlugAction).isInstanceOf(ProductTailoringSetSlugAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTailoringSetSlugAction.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductTailoringSetSlugAction.builder().staged(true) } };
+                new Object[] { "slug",
+                        ProductTailoringSetSlugAction.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "staged", ProductTailoringSetSlugAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringTest.java
index b52c9fb54e0..7f28a43822a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringTest.java
@@ -4,51 +4,49 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTailoringBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTailoringBuilder builder) {
         ProductTailoring productTailoring = builder.buildUnchecked();
         Assertions.assertThat(productTailoring).isInstanceOf(ProductTailoring.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTailoring.builder().id("id") },
-                new Object[] { ProductTailoring.builder().version(2L) },
-                new Object[] { ProductTailoring.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductTailoring.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductTailoring.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", ProductTailoring.builder().id("id") },
+                new Object[] { "version", ProductTailoring.builder().version(2L) },
+                new Object[] { "createdAt",
+                        ProductTailoring.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        ProductTailoring.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        ProductTailoring.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         ProductTailoring.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { ProductTailoring.builder().key("key") },
-                new Object[] { ProductTailoring.builder()
-                        .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ProductTailoring.builder()
-                        .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
-                new Object[] { ProductTailoring.builder().published(true) },
-                new Object[] { ProductTailoring.builder()
+                new Object[] { "key", ProductTailoring.builder().key("key") },
+                new Object[] { "store",
+                        ProductTailoring.builder()
+                                .store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "product",
+                        ProductTailoring.builder()
+                                .product(new com.commercetools.api.models.product.ProductReferenceImpl()) },
+                new Object[] { "published", ProductTailoring.builder().published(true) },
+                new Object[] { "current", ProductTailoring.builder()
                         .current(new com.commercetools.api.models.product_tailoring.ProductTailoringDataImpl()) },
-                new Object[] { ProductTailoring.builder()
+                new Object[] { "staged", ProductTailoring.builder()
                         .staged(new com.commercetools.api.models.product_tailoring.ProductTailoringDataImpl()) },
-                new Object[] { ProductTailoring.builder().hasStagedChanges(true) },
-                new Object[] { ProductTailoring.builder()
-                        .warnings(Collections
-                                .singletonList(new com.commercetools.api.models.warning.WarningObjectImpl())) } };
+                new Object[] { "hasStagedChanges", ProductTailoring.builder().hasStagedChanges(true) },
+                new Object[] { "warnings",
+                        ProductTailoring.builder()
+                                .warnings(Collections.singletonList(
+                                    new com.commercetools.api.models.warning.WarningObjectImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringUnpublishActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringUnpublishActionTest.java
index f0e5224521b..adbe4ae8569 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringUnpublishActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductTailoringUnpublishActionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_tailoring;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTailoringUnpublishActionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductVariantTailoringDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductVariantTailoringDraftTest.java
index fe81a4de78e..8e8f3294746 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductVariantTailoringDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductVariantTailoringDraftTest.java
@@ -3,36 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantTailoringDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantTailoringDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantTailoringDraftBuilder builder) {
         ProductVariantTailoringDraft productVariantTailoringDraft = builder.buildUnchecked();
         Assertions.assertThat(productVariantTailoringDraft).isInstanceOf(ProductVariantTailoringDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantTailoringDraft.builder().id(2L) },
-                new Object[] { ProductVariantTailoringDraft.builder().sku("sku") },
-                new Object[] { ProductVariantTailoringDraft.builder()
+        return new Object[][] { new Object[] { "id", ProductVariantTailoringDraft.builder().id(2L) },
+                new Object[] { "sku", ProductVariantTailoringDraft.builder().sku("sku") },
+                new Object[] { "images", ProductVariantTailoringDraft.builder()
                         .images(Collections.singletonList(new com.commercetools.api.models.common.ImageImpl())) },
-                new Object[] { ProductVariantTailoringDraft.builder()
+                new Object[] { "assets", ProductVariantTailoringDraft.builder()
                         .assets(Collections.singletonList(new com.commercetools.api.models.common.AssetImpl())) },
-                new Object[] { ProductVariantTailoringDraft.builder()
+                new Object[] { "attributes", ProductVariantTailoringDraft.builder()
                         .attributes(Collections.singletonList(
                             new com.commercetools.api.models.product_tailoring.ProductTailoringAttributeImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductVariantTailoringTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductVariantTailoringTest.java
index ce88c818e25..ccdef49e584 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductVariantTailoringTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_tailoring/ProductVariantTailoringTest.java
@@ -3,35 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantTailoringTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantTailoringBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantTailoringBuilder builder) {
         ProductVariantTailoring productVariantTailoring = builder.buildUnchecked();
         Assertions.assertThat(productVariantTailoring).isInstanceOf(ProductVariantTailoring.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantTailoring.builder().id(2L) },
-                new Object[] { ProductVariantTailoring.builder()
+        return new Object[][] { new Object[] { "id", ProductVariantTailoring.builder().id(2L) },
+                new Object[] { "images", ProductVariantTailoring.builder()
                         .images(Collections.singletonList(new com.commercetools.api.models.common.ImageImpl())) },
-                new Object[] { ProductVariantTailoring.builder()
+                new Object[] { "assets", ProductVariantTailoring.builder()
                         .assets(Collections.singletonList(new com.commercetools.api.models.common.AssetImpl())) },
-                new Object[] { ProductVariantTailoring.builder()
+                new Object[] { "attributes", ProductVariantTailoring.builder()
                         .attributes(Collections.singletonList(
                             new com.commercetools.api.models.product_tailoring.ProductTailoringAttributeImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeBooleanTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeBooleanTypeTest.java
index e797ef7b016..8f9c9d3d31c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeBooleanTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeBooleanTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeBooleanTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDateTimeTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDateTimeTypeTest.java
index 1c9edcd9c1f..3cbfb349699 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDateTimeTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDateTimeTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeDateTimeTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDateTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDateTypeTest.java
index 4c36a8dd961..ad65e0116d8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDateTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDateTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeDateTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDefinitionDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDefinitionDraftTest.java
index 48db2c70f20..18ec0b18d1b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDefinitionDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDefinitionDraftTest.java
@@ -1,45 +1,40 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeDefinitionDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeDefinitionDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeDefinitionDraftBuilder builder) {
         AttributeDefinitionDraft attributeDefinitionDraft = builder.buildUnchecked();
         Assertions.assertThat(attributeDefinitionDraft).isInstanceOf(AttributeDefinitionDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { AttributeDefinitionDraft.builder()
-                        .type(new com.commercetools.api.models.product_type.AttributeTypeImpl()) },
-                new Object[] { AttributeDefinitionDraft.builder().name("name") },
-                new Object[] { AttributeDefinitionDraft.builder()
-                        .label(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { AttributeDefinitionDraft.builder().isRequired(true) },
-                new Object[] {
+                new Object[] { "type",
+                        AttributeDefinitionDraft.builder()
+                                .type(new com.commercetools.api.models.product_type.AttributeTypeImpl()) },
+                new Object[] { "name", AttributeDefinitionDraft.builder().name("name") },
+                new Object[] { "label",
+                        AttributeDefinitionDraft.builder()
+                                .label(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "isRequired", AttributeDefinitionDraft.builder().isRequired(true) },
+                new Object[] { "attributeConstraint",
                         AttributeDefinitionDraft.builder()
                                 .attributeConstraint(com.commercetools.api.models.product_type.AttributeConstraintEnum
                                         .findEnum("None")) },
-                new Object[] { AttributeDefinitionDraft.builder()
-                        .inputTip(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { AttributeDefinitionDraft.builder()
+                new Object[] { "inputTip",
+                        AttributeDefinitionDraft.builder()
+                                .inputTip(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "inputHint", AttributeDefinitionDraft.builder()
                         .inputHint(com.commercetools.api.models.product_type.TextInputHint.findEnum("SingleLine")) },
-                new Object[] { AttributeDefinitionDraft.builder().isSearchable(true) } };
+                new Object[] { "isSearchable", AttributeDefinitionDraft.builder().isSearchable(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDefinitionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDefinitionTest.java
index 1e0f2ca6133..3dbb9874b16 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDefinitionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeDefinitionTest.java
@@ -1,45 +1,40 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeDefinitionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeDefinitionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeDefinitionBuilder builder) {
         AttributeDefinition attributeDefinition = builder.buildUnchecked();
         Assertions.assertThat(attributeDefinition).isInstanceOf(AttributeDefinition.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { AttributeDefinition.builder()
-                        .type(new com.commercetools.api.models.product_type.AttributeTypeImpl()) },
-                new Object[] { AttributeDefinition.builder().name("name") },
-                new Object[] { AttributeDefinition.builder()
-                        .label(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { AttributeDefinition.builder().isRequired(true) },
-                new Object[] {
+                new Object[] { "type",
+                        AttributeDefinition.builder()
+                                .type(new com.commercetools.api.models.product_type.AttributeTypeImpl()) },
+                new Object[] { "name", AttributeDefinition.builder().name("name") },
+                new Object[] { "label",
+                        AttributeDefinition.builder()
+                                .label(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "isRequired", AttributeDefinition.builder().isRequired(true) },
+                new Object[] { "attributeConstraint",
                         AttributeDefinition.builder()
                                 .attributeConstraint(com.commercetools.api.models.product_type.AttributeConstraintEnum
                                         .findEnum("None")) },
-                new Object[] { AttributeDefinition.builder()
-                        .inputTip(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { AttributeDefinition.builder()
+                new Object[] { "inputTip",
+                        AttributeDefinition.builder()
+                                .inputTip(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "inputHint", AttributeDefinition.builder()
                         .inputHint(com.commercetools.api.models.product_type.TextInputHint.findEnum("SingleLine")) },
-                new Object[] { AttributeDefinition.builder().isSearchable(true) } };
+                new Object[] { "isSearchable", AttributeDefinition.builder().isSearchable(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeEnumTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeEnumTypeTest.java
index 95a3d226de4..51672ddb672 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeEnumTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeEnumTypeTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeEnumTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeEnumTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeEnumTypeBuilder builder) {
         AttributeEnumType attributeEnumType = builder.buildUnchecked();
         Assertions.assertThat(attributeEnumType).isInstanceOf(AttributeEnumType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeEnumType.builder()
-                .values(Collections.singletonList(
-                    new com.commercetools.api.models.product_type.AttributePlainEnumValueImpl())) } };
+        return new Object[][] { new Object[] { "values",
+                AttributeEnumType.builder()
+                        .values(Collections.singletonList(
+                            new com.commercetools.api.models.product_type.AttributePlainEnumValueImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeLocalizableTextTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeLocalizableTextTypeTest.java
index 6b26aec7b6e..a55a095e624 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeLocalizableTextTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeLocalizableTextTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeLocalizableTextTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeLocalizedEnumTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeLocalizedEnumTypeTest.java
index e2df2524652..aa051aea376 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeLocalizedEnumTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeLocalizedEnumTypeTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeLocalizedEnumTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeLocalizedEnumTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeLocalizedEnumTypeBuilder builder) {
         AttributeLocalizedEnumType attributeLocalizedEnumType = builder.buildUnchecked();
         Assertions.assertThat(attributeLocalizedEnumType).isInstanceOf(AttributeLocalizedEnumType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeLocalizedEnumType.builder()
-                .values(Collections.singletonList(
-                    new com.commercetools.api.models.product_type.AttributeLocalizedEnumValueImpl())) } };
+        return new Object[][] { new Object[] { "values",
+                AttributeLocalizedEnumType.builder()
+                        .values(Collections.singletonList(
+                            new com.commercetools.api.models.product_type.AttributeLocalizedEnumValueImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeLocalizedEnumValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeLocalizedEnumValueTest.java
index 0ddd70be569..78a36b39f9f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeLocalizedEnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeLocalizedEnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeLocalizedEnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeLocalizedEnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeLocalizedEnumValueBuilder builder) {
         AttributeLocalizedEnumValue attributeLocalizedEnumValue = builder.buildUnchecked();
         Assertions.assertThat(attributeLocalizedEnumValue).isInstanceOf(AttributeLocalizedEnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeLocalizedEnumValue.builder().key("key") },
-                new Object[] { AttributeLocalizedEnumValue.builder()
+        return new Object[][] { new Object[] { "key", AttributeLocalizedEnumValue.builder().key("key") },
+                new Object[] { "label", AttributeLocalizedEnumValue.builder()
                         .label(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeMoneyTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeMoneyTypeTest.java
index c17629c4464..44dde02032e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeMoneyTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeMoneyTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeMoneyTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeNestedTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeNestedTypeTest.java
index 71ae634f475..735f4de4e04 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeNestedTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeNestedTypeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeNestedTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeNestedTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeNestedTypeBuilder builder) {
         AttributeNestedType attributeNestedType = builder.buildUnchecked();
         Assertions.assertThat(attributeNestedType).isInstanceOf(AttributeNestedType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeNestedType.builder()
+        return new Object[][] { new Object[] { "typeReference", AttributeNestedType.builder()
                 .typeReference(new com.commercetools.api.models.product_type.ProductTypeReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeNumberTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeNumberTypeTest.java
index 17a15ca33be..910cb559778 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeNumberTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeNumberTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeNumberTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributePlainEnumValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributePlainEnumValueTest.java
index cb5f169d30f..03163d35b8f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributePlainEnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributePlainEnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributePlainEnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributePlainEnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributePlainEnumValueBuilder builder) {
         AttributePlainEnumValue attributePlainEnumValue = builder.buildUnchecked();
         Assertions.assertThat(attributePlainEnumValue).isInstanceOf(AttributePlainEnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributePlainEnumValue.builder().key("key") },
-                new Object[] { AttributePlainEnumValue.builder().label("label") } };
+        return new Object[][] { new Object[] { "key", AttributePlainEnumValue.builder().key("key") },
+                new Object[] { "label", AttributePlainEnumValue.builder().label("label") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeTest.java
index d82824fb2fe..f2381e95a7b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeReferenceTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeReferenceTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeReferenceTypeBuilder builder) {
         AttributeReferenceType attributeReferenceType = builder.buildUnchecked();
         Assertions.assertThat(attributeReferenceType).isInstanceOf(AttributeReferenceType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeReferenceType.builder()
+        return new Object[][] { new Object[] { "referenceTypeId", AttributeReferenceType.builder()
                 .referenceTypeId(
                     com.commercetools.api.models.product_type.AttributeReferenceTypeId.findEnum("associate-role")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeSetTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeSetTypeTest.java
index ad34d433425..9b5a5b50baf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeSetTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeSetTypeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeSetTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeSetTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeSetTypeBuilder builder) {
         AttributeSetType attributeSetType = builder.buildUnchecked();
         Assertions.assertThat(attributeSetType).isInstanceOf(AttributeSetType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeSetType.builder()
+        return new Object[][] { new Object[] { "elementType", AttributeSetType.builder()
                 .elementType(new com.commercetools.api.models.product_type.AttributeTypeImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeTextTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeTextTypeTest.java
index c3be4ed3a21..3eb8ea17e72 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeTextTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeTextTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeTextTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeTimeTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeTimeTypeTest.java
index 27bec05284f..03ba8f90bf2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeTimeTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeTimeTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeTimeTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeAddAttributeDefinitionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeAddAttributeDefinitionActionTest.java
index 8d61f303807..9273d0fd9fd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeAddAttributeDefinitionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeAddAttributeDefinitionActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeAddAttributeDefinitionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeAddAttributeDefinitionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeAddAttributeDefinitionActionBuilder builder) {
         ProductTypeAddAttributeDefinitionAction productTypeAddAttributeDefinitionAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeAddAttributeDefinitionAction)
                 .isInstanceOf(ProductTypeAddAttributeDefinitionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypeAddAttributeDefinitionAction.builder()
+        return new Object[][] { new Object[] { "attribute", ProductTypeAddAttributeDefinitionAction.builder()
                 .attribute(new com.commercetools.api.models.product_type.AttributeDefinitionDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeAddLocalizedEnumValueActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeAddLocalizedEnumValueActionTest.java
index 6201c5d56c3..c4b6b6181c0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeAddLocalizedEnumValueActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeAddLocalizedEnumValueActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeAddLocalizedEnumValueActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeAddLocalizedEnumValueActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeAddLocalizedEnumValueActionBuilder builder) {
         ProductTypeAddLocalizedEnumValueAction productTypeAddLocalizedEnumValueAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeAddLocalizedEnumValueAction)
                 .isInstanceOf(ProductTypeAddLocalizedEnumValueAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTypeAddLocalizedEnumValueAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeAddLocalizedEnumValueAction.builder()
+                new Object[] { "attributeName",
+                        ProductTypeAddLocalizedEnumValueAction.builder().attributeName("attributeName") },
+                new Object[] { "value", ProductTypeAddLocalizedEnumValueAction.builder()
                         .value(new com.commercetools.api.models.product_type.AttributeLocalizedEnumValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeAddPlainEnumValueActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeAddPlainEnumValueActionTest.java
index 33a576aeb0d..9a52c13ce74 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeAddPlainEnumValueActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeAddPlainEnumValueActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeAddPlainEnumValueActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeAddPlainEnumValueActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeAddPlainEnumValueActionBuilder builder) {
         ProductTypeAddPlainEnumValueAction productTypeAddPlainEnumValueAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeAddPlainEnumValueAction)
                 .isInstanceOf(ProductTypeAddPlainEnumValueAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTypeAddPlainEnumValueAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeAddPlainEnumValueAction.builder()
+                new Object[] { "attributeName",
+                        ProductTypeAddPlainEnumValueAction.builder().attributeName("attributeName") },
+                new Object[] { "value", ProductTypeAddPlainEnumValueAction.builder()
                         .value(new com.commercetools.api.models.product_type.AttributePlainEnumValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeAttributeConstraintActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeAttributeConstraintActionTest.java
index cd3c811dac5..eeb5bb88c98 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeAttributeConstraintActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeAttributeConstraintActionTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangeAttributeConstraintActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangeAttributeConstraintActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangeAttributeConstraintActionBuilder builder) {
         ProductTypeChangeAttributeConstraintAction productTypeChangeAttributeConstraintAction = builder
                 .buildUnchecked();
         Assertions.assertThat(productTypeChangeAttributeConstraintAction)
                 .isInstanceOf(ProductTypeChangeAttributeConstraintAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTypeChangeAttributeConstraintAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeChangeAttributeConstraintAction.builder()
-                        .newValue(com.commercetools.api.models.product_type.AttributeConstraintEnumDraft
-                                .findEnum("None")) } };
+                new Object[] { "attributeName",
+                        ProductTypeChangeAttributeConstraintAction.builder().attributeName("attributeName") },
+                new Object[] { "newValue",
+                        ProductTypeChangeAttributeConstraintAction.builder()
+                                .newValue(com.commercetools.api.models.product_type.AttributeConstraintEnumDraft
+                                        .findEnum("None")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeAttributeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeAttributeNameActionTest.java
index a7b2054a648..5b751cbf356 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeAttributeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeAttributeNameActionTest.java
@@ -1,33 +1,27 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangeAttributeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangeAttributeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangeAttributeNameActionBuilder builder) {
         ProductTypeChangeAttributeNameAction productTypeChangeAttributeNameAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeChangeAttributeNameAction)
                 .isInstanceOf(ProductTypeChangeAttributeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTypeChangeAttributeNameAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeChangeAttributeNameAction.builder().newAttributeName("newAttributeName") } };
+                new Object[] { "attributeName",
+                        ProductTypeChangeAttributeNameAction.builder().attributeName("attributeName") },
+                new Object[] { "newAttributeName",
+                        ProductTypeChangeAttributeNameAction.builder().newAttributeName("newAttributeName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeAttributeOrderByNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeAttributeOrderByNameActionTest.java
index 95da3f4add0..31e6fde3fe5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeAttributeOrderByNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeAttributeOrderByNameActionTest.java
@@ -3,32 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangeAttributeOrderByNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangeAttributeOrderByNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangeAttributeOrderByNameActionBuilder builder) {
         ProductTypeChangeAttributeOrderByNameAction productTypeChangeAttributeOrderByNameAction = builder
                 .buildUnchecked();
         Assertions.assertThat(productTypeChangeAttributeOrderByNameAction)
                 .isInstanceOf(ProductTypeChangeAttributeOrderByNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypeChangeAttributeOrderByNameAction.builder()
+        return new Object[][] { new Object[] { "attributeNames", ProductTypeChangeAttributeOrderByNameAction.builder()
                 .attributeNames(Collections.singletonList("attributeNames")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeDescriptionActionTest.java
index 535a49b94c1..93f790ab129 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeDescriptionActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangeDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangeDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangeDescriptionActionBuilder builder) {
         ProductTypeChangeDescriptionAction productTypeChangeDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeChangeDescriptionAction)
                 .isInstanceOf(ProductTypeChangeDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { ProductTypeChangeDescriptionAction.builder().description("description") } };
+        return new Object[][] { new Object[] { "description",
+                ProductTypeChangeDescriptionAction.builder().description("description") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeEnumKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeEnumKeyActionTest.java
index de0b296a43d..492af80596c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeEnumKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeEnumKeyActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangeEnumKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangeEnumKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangeEnumKeyActionBuilder builder) {
         ProductTypeChangeEnumKeyAction productTypeChangeEnumKeyAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeChangeEnumKeyAction).isInstanceOf(ProductTypeChangeEnumKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTypeChangeEnumKeyAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeChangeEnumKeyAction.builder().key("key") },
-                new Object[] { ProductTypeChangeEnumKeyAction.builder().newKey("newKey") } };
+                new Object[] { "attributeName",
+                        ProductTypeChangeEnumKeyAction.builder().attributeName("attributeName") },
+                new Object[] { "key", ProductTypeChangeEnumKeyAction.builder().key("key") },
+                new Object[] { "newKey", ProductTypeChangeEnumKeyAction.builder().newKey("newKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeInputHintActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeInputHintActionTest.java
index 1a0d7407fc0..025b1d72d2f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeInputHintActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeInputHintActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangeInputHintActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangeInputHintActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangeInputHintActionBuilder builder) {
         ProductTypeChangeInputHintAction productTypeChangeInputHintAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeChangeInputHintAction).isInstanceOf(ProductTypeChangeInputHintAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTypeChangeInputHintAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeChangeInputHintAction.builder()
+                new Object[] { "attributeName",
+                        ProductTypeChangeInputHintAction.builder().attributeName("attributeName") },
+                new Object[] { "newValue", ProductTypeChangeInputHintAction.builder()
                         .newValue(com.commercetools.api.models.product_type.TextInputHint.findEnum("SingleLine")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeIsSearchableActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeIsSearchableActionTest.java
index 5b70167f926..3866d2fc80a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeIsSearchableActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeIsSearchableActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangeIsSearchableActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangeIsSearchableActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangeIsSearchableActionBuilder builder) {
         ProductTypeChangeIsSearchableAction productTypeChangeIsSearchableAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeChangeIsSearchableAction)
                 .isInstanceOf(ProductTypeChangeIsSearchableAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTypeChangeIsSearchableAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeChangeIsSearchableAction.builder().isSearchable(true) } };
+                new Object[] { "attributeName",
+                        ProductTypeChangeIsSearchableAction.builder().attributeName("attributeName") },
+                new Object[] { "isSearchable", ProductTypeChangeIsSearchableAction.builder().isSearchable(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeLabelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeLabelActionTest.java
index e1c57980caf..f3ad0a8cb4a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeLabelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeLabelActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangeLabelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangeLabelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangeLabelActionBuilder builder) {
         ProductTypeChangeLabelAction productTypeChangeLabelAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeChangeLabelAction).isInstanceOf(ProductTypeChangeLabelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypeChangeLabelAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeChangeLabelAction.builder()
+        return new Object[][] {
+                new Object[] { "attributeName", ProductTypeChangeLabelAction.builder().attributeName("attributeName") },
+                new Object[] { "label", ProductTypeChangeLabelAction.builder()
                         .label(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeLocalizedEnumValueLabelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeLocalizedEnumValueLabelActionTest.java
index 85163cc562a..b96c5821869 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeLocalizedEnumValueLabelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeLocalizedEnumValueLabelActionTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangeLocalizedEnumValueLabelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangeLocalizedEnumValueLabelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangeLocalizedEnumValueLabelActionBuilder builder) {
         ProductTypeChangeLocalizedEnumValueLabelAction productTypeChangeLocalizedEnumValueLabelAction = builder
                 .buildUnchecked();
         Assertions.assertThat(productTypeChangeLocalizedEnumValueLabelAction)
                 .isInstanceOf(ProductTypeChangeLocalizedEnumValueLabelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "attributeName",
                         ProductTypeChangeLocalizedEnumValueLabelAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeChangeLocalizedEnumValueLabelAction.builder()
+                new Object[] { "newValue", ProductTypeChangeLocalizedEnumValueLabelAction.builder()
                         .newValue(new com.commercetools.api.models.product_type.AttributeLocalizedEnumValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeLocalizedEnumValueOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeLocalizedEnumValueOrderActionTest.java
index b4e02ea945e..7a2a59f6e0f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeLocalizedEnumValueOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeLocalizedEnumValueOrderActionTest.java
@@ -3,35 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangeLocalizedEnumValueOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangeLocalizedEnumValueOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangeLocalizedEnumValueOrderActionBuilder builder) {
         ProductTypeChangeLocalizedEnumValueOrderAction productTypeChangeLocalizedEnumValueOrderAction = builder
                 .buildUnchecked();
         Assertions.assertThat(productTypeChangeLocalizedEnumValueOrderAction)
                 .isInstanceOf(ProductTypeChangeLocalizedEnumValueOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "attributeName",
                         ProductTypeChangeLocalizedEnumValueOrderAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeChangeLocalizedEnumValueOrderAction.builder()
+                new Object[] { "values", ProductTypeChangeLocalizedEnumValueOrderAction.builder()
                         .values(Collections.singletonList(
                             new com.commercetools.api.models.product_type.AttributeLocalizedEnumValueImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeNameActionTest.java
index b72c348114e..f5b7324970b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangeNameActionBuilder builder) {
         ProductTypeChangeNameAction productTypeChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeChangeNameAction).isInstanceOf(ProductTypeChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypeChangeNameAction.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", ProductTypeChangeNameAction.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangePlainEnumValueLabelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangePlainEnumValueLabelActionTest.java
index 5dd25a9451b..1fa83873f6d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangePlainEnumValueLabelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangePlainEnumValueLabelActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangePlainEnumValueLabelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangePlainEnumValueLabelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangePlainEnumValueLabelActionBuilder builder) {
         ProductTypeChangePlainEnumValueLabelAction productTypeChangePlainEnumValueLabelAction = builder
                 .buildUnchecked();
         Assertions.assertThat(productTypeChangePlainEnumValueLabelAction)
                 .isInstanceOf(ProductTypeChangePlainEnumValueLabelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTypeChangePlainEnumValueLabelAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeChangePlainEnumValueLabelAction.builder()
+                new Object[] { "attributeName",
+                        ProductTypeChangePlainEnumValueLabelAction.builder().attributeName("attributeName") },
+                new Object[] { "newValue", ProductTypeChangePlainEnumValueLabelAction.builder()
                         .newValue(new com.commercetools.api.models.product_type.AttributePlainEnumValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangePlainEnumValueOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangePlainEnumValueOrderActionTest.java
index e57db06dc2d..60bf7bb022c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangePlainEnumValueOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeChangePlainEnumValueOrderActionTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeChangePlainEnumValueOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeChangePlainEnumValueOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeChangePlainEnumValueOrderActionBuilder builder) {
         ProductTypeChangePlainEnumValueOrderAction productTypeChangePlainEnumValueOrderAction = builder
                 .buildUnchecked();
         Assertions.assertThat(productTypeChangePlainEnumValueOrderAction)
                 .isInstanceOf(ProductTypeChangePlainEnumValueOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTypeChangePlainEnumValueOrderAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeChangePlainEnumValueOrderAction.builder()
-                        .values(Collections.singletonList(
-                            new com.commercetools.api.models.product_type.AttributePlainEnumValueImpl())) } };
+                new Object[] { "attributeName",
+                        ProductTypeChangePlainEnumValueOrderAction.builder().attributeName("attributeName") },
+                new Object[] { "values",
+                        ProductTypeChangePlainEnumValueOrderAction.builder()
+                                .values(Collections.singletonList(
+                                    new com.commercetools.api.models.product_type.AttributePlainEnumValueImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeDraftTest.java
index 2e0cf4f29b5..11f6b896ee2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeDraftTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeDraftBuilder builder) {
         ProductTypeDraft productTypeDraft = builder.buildUnchecked();
         Assertions.assertThat(productTypeDraft).isInstanceOf(ProductTypeDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypeDraft.builder().key("key") },
-                new Object[] { ProductTypeDraft.builder().name("name") },
-                new Object[] { ProductTypeDraft.builder().description("description") },
-                new Object[] { ProductTypeDraft.builder()
-                        .attributes(Collections.singletonList(
-                            new com.commercetools.api.models.product_type.AttributeDefinitionDraftImpl())) } };
+        return new Object[][] { new Object[] { "key", ProductTypeDraft.builder().key("key") },
+                new Object[] { "name", ProductTypeDraft.builder().name("name") },
+                new Object[] { "description", ProductTypeDraft.builder().description("description") },
+                new Object[] { "attributes",
+                        ProductTypeDraft.builder()
+                                .attributes(Collections.singletonList(
+                                    new com.commercetools.api.models.product_type.AttributeDefinitionDraftImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypePagedQueryResponseTest.java
index 6466dda1c61..13eb03be146 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypePagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypePagedQueryResponseBuilder builder) {
         ProductTypePagedQueryResponse productTypePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(productTypePagedQueryResponse).isInstanceOf(ProductTypePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypePagedQueryResponse.builder().limit(7L) },
-                new Object[] { ProductTypePagedQueryResponse.builder().offset(3L) },
-                new Object[] { ProductTypePagedQueryResponse.builder().count(2L) },
-                new Object[] { ProductTypePagedQueryResponse.builder().total(1L) },
-                new Object[] { ProductTypePagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.product_type.ProductTypeImpl())) } };
+        return new Object[][] { new Object[] { "limit", ProductTypePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ProductTypePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ProductTypePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ProductTypePagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        ProductTypePagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.product_type.ProductTypeImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeReferenceTest.java
index 93153c3701c..68b7d2dcf9d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeReferenceBuilder builder) {
         ProductTypeReference productTypeReference = builder.buildUnchecked();
         Assertions.assertThat(productTypeReference).isInstanceOf(ProductTypeReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTypeReference.builder()
-                        .obj(new com.commercetools.api.models.product_type.ProductTypeImpl()) },
-                new Object[] { ProductTypeReference.builder().id("id") } };
+                new Object[] { "obj",
+                        ProductTypeReference.builder()
+                                .obj(new com.commercetools.api.models.product_type.ProductTypeImpl()) },
+                new Object[] { "id", ProductTypeReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeRemoveAttributeDefinitionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeRemoveAttributeDefinitionActionTest.java
index b75a5e74786..703413fbeea 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeRemoveAttributeDefinitionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeRemoveAttributeDefinitionActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeRemoveAttributeDefinitionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeRemoveAttributeDefinitionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeRemoveAttributeDefinitionActionBuilder builder) {
         ProductTypeRemoveAttributeDefinitionAction productTypeRemoveAttributeDefinitionAction = builder
                 .buildUnchecked();
         Assertions.assertThat(productTypeRemoveAttributeDefinitionAction)
                 .isInstanceOf(ProductTypeRemoveAttributeDefinitionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypeRemoveAttributeDefinitionAction.builder().name("name") } };
+        return new Object[][] {
+                new Object[] { "name", ProductTypeRemoveAttributeDefinitionAction.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeRemoveEnumValuesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeRemoveEnumValuesActionTest.java
index 27f9dda17d5..a2dac395c19 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeRemoveEnumValuesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeRemoveEnumValuesActionTest.java
@@ -3,32 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeRemoveEnumValuesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeRemoveEnumValuesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeRemoveEnumValuesActionBuilder builder) {
         ProductTypeRemoveEnumValuesAction productTypeRemoveEnumValuesAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeRemoveEnumValuesAction).isInstanceOf(ProductTypeRemoveEnumValuesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductTypeRemoveEnumValuesAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeRemoveEnumValuesAction.builder().keys(Collections.singletonList("keys")) } };
+                new Object[] { "attributeName",
+                        ProductTypeRemoveEnumValuesAction.builder().attributeName("attributeName") },
+                new Object[] { "keys",
+                        ProductTypeRemoveEnumValuesAction.builder().keys(Collections.singletonList("keys")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeResourceIdentifierTest.java
index 176c22132c4..e3a74317b23 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeResourceIdentifierBuilder builder) {
         ProductTypeResourceIdentifier productTypeResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(productTypeResourceIdentifier).isInstanceOf(ProductTypeResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypeResourceIdentifier.builder().id("id") },
-                new Object[] { ProductTypeResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", ProductTypeResourceIdentifier.builder().id("id") },
+                new Object[] { "key", ProductTypeResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeSetInputTipActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeSetInputTipActionTest.java
index e0f23236b5a..40e24d5afaa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeSetInputTipActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeSetInputTipActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeSetInputTipActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeSetInputTipActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeSetInputTipActionBuilder builder) {
         ProductTypeSetInputTipAction productTypeSetInputTipAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeSetInputTipAction).isInstanceOf(ProductTypeSetInputTipAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypeSetInputTipAction.builder().attributeName("attributeName") },
-                new Object[] { ProductTypeSetInputTipAction.builder()
+        return new Object[][] {
+                new Object[] { "attributeName", ProductTypeSetInputTipAction.builder().attributeName("attributeName") },
+                new Object[] { "inputTip", ProductTypeSetInputTipAction.builder()
                         .inputTip(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeSetKeyActionTest.java
index ecaa755db92..2633cc51834 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.product_type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeSetKeyActionBuilder builder) {
         ProductTypeSetKeyAction productTypeSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(productTypeSetKeyAction).isInstanceOf(ProductTypeSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypeSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ProductTypeSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeTest.java
index fc5e419b2dd..53b2cd2ff8a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeTest.java
@@ -4,42 +4,38 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeBuilder builder) {
         ProductType productType = builder.buildUnchecked();
         Assertions.assertThat(productType).isInstanceOf(ProductType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductType.builder().id("id") },
-                new Object[] { ProductType.builder().version(2L) },
-                new Object[] { ProductType.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductType.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ProductType.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", ProductType.builder().id("id") },
+                new Object[] { "version", ProductType.builder().version(2L) },
+                new Object[] { "createdAt", ProductType.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        ProductType.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        ProductType.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         ProductType.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { ProductType.builder().key("key") }, new Object[] { ProductType.builder().name("name") },
-                new Object[] { ProductType.builder().description("description") },
-                new Object[] { ProductType.builder()
-                        .attributes(Collections.singletonList(
-                            new com.commercetools.api.models.product_type.AttributeDefinitionImpl())) } };
+                new Object[] { "key", ProductType.builder().key("key") },
+                new Object[] { "name", ProductType.builder().name("name") },
+                new Object[] { "description", ProductType.builder().description("description") },
+                new Object[] { "attributes",
+                        ProductType.builder()
+                                .attributes(Collections.singletonList(
+                                    new com.commercetools.api.models.product_type.AttributeDefinitionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeUpdateTest.java
index 265ae7d2a63..64d3ab07208 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/ProductTypeUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeUpdateBuilder builder) {
         ProductTypeUpdate productTypeUpdate = builder.buildUnchecked();
         Assertions.assertThat(productTypeUpdate).isInstanceOf(ProductTypeUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypeUpdate.builder().version(2L) },
-                new Object[] { ProductTypeUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.product_type.ProductTypeUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", ProductTypeUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        ProductTypeUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.product_type.ProductTypeUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/BusinessUnitConfigurationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/BusinessUnitConfigurationTest.java
index c30072a6ca2..6d48bb4e4fc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/BusinessUnitConfigurationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/BusinessUnitConfigurationTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitConfigurationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitConfigurationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitConfigurationBuilder builder) {
         BusinessUnitConfiguration businessUnitConfiguration = builder.buildUnchecked();
         Assertions.assertThat(businessUnitConfiguration).isInstanceOf(BusinessUnitConfiguration.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { BusinessUnitConfiguration.builder()
+                new Object[] { "myBusinessUnitStatusOnCreation", BusinessUnitConfiguration.builder()
                         .myBusinessUnitStatusOnCreation(
                             com.commercetools.api.models.project.BusinessUnitConfigurationStatus.findEnum("Active")) },
-                new Object[] { BusinessUnitConfiguration.builder()
+                new Object[] { "myBusinessUnitAssociateRoleOnCreation", BusinessUnitConfiguration.builder()
                         .myBusinessUnitAssociateRoleOnCreation(
                             new com.commercetools.api.models.associate_role.AssociateRoleKeyReferenceImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartClassificationTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartClassificationTypeTest.java
index 3bb5205cce2..72d09b548fb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartClassificationTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartClassificationTypeTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartClassificationTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartClassificationTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartClassificationTypeBuilder builder) {
         CartClassificationType cartClassificationType = builder.buildUnchecked();
         Assertions.assertThat(cartClassificationType).isInstanceOf(CartClassificationType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartClassificationType.builder()
-                .values(Collections
-                        .singletonList(new com.commercetools.api.models.type.CustomFieldLocalizedEnumValueImpl())) } };
+        return new Object[][] { new Object[] { "values",
+                CartClassificationType.builder()
+                        .values(Collections.singletonList(
+                            new com.commercetools.api.models.type.CustomFieldLocalizedEnumValueImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartScoreTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartScoreTypeTest.java
index 93c25ecbc35..67d2ec42fcf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartScoreTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartScoreTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartScoreTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartValueTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartValueTypeTest.java
index 2c54ba1b68d..a35b194e9ac 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartValueTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartValueTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartValueTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartsConfigurationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartsConfigurationTest.java
index 6e88b9582a8..643e0c14866 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartsConfigurationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/CartsConfigurationTest.java
@@ -1,31 +1,26 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartsConfigurationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartsConfigurationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartsConfigurationBuilder builder) {
         CartsConfiguration cartsConfiguration = builder.buildUnchecked();
         Assertions.assertThat(cartsConfiguration).isInstanceOf(CartsConfiguration.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartsConfiguration.builder().deleteDaysAfterLastModification(3L) },
-                new Object[] { CartsConfiguration.builder().countryTaxRateFallbackEnabled(true) } };
+        return new Object[][] {
+                new Object[] { "deleteDaysAfterLastModification",
+                        CartsConfiguration.builder().deleteDaysAfterLastModification(3L) },
+                new Object[] { "countryTaxRateFallbackEnabled",
+                        CartsConfiguration.builder().countryTaxRateFallbackEnabled(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ExternalOAuthTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ExternalOAuthTest.java
index b817b2ef0b6..582b8df7220 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ExternalOAuthTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ExternalOAuthTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExternalOAuthTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExternalOAuthBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExternalOAuthBuilder builder) {
         ExternalOAuth externalOAuth = builder.buildUnchecked();
         Assertions.assertThat(externalOAuth).isInstanceOf(ExternalOAuth.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExternalOAuth.builder().url("url") },
-                new Object[] { ExternalOAuth.builder().authorizationHeader("authorizationHeader") } };
+        return new Object[][] { new Object[] { "url", ExternalOAuth.builder().url("url") }, new Object[] {
+                "authorizationHeader", ExternalOAuth.builder().authorizationHeader("authorizationHeader") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeBusinessUnitSearchStatusActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeBusinessUnitSearchStatusActionTest.java
index 64bfe94db30..87cb0905d0b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeBusinessUnitSearchStatusActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeBusinessUnitSearchStatusActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeBusinessUnitSearchStatusActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeBusinessUnitSearchStatusActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeBusinessUnitSearchStatusActionBuilder builder) {
         ProjectChangeBusinessUnitSearchStatusAction projectChangeBusinessUnitSearchStatusAction = builder
                 .buildUnchecked();
         Assertions.assertThat(projectChangeBusinessUnitSearchStatusAction)
                 .isInstanceOf(ProjectChangeBusinessUnitSearchStatusAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectChangeBusinessUnitSearchStatusAction.builder()
+        return new Object[][] { new Object[] { "status", ProjectChangeBusinessUnitSearchStatusAction.builder()
                 .status(com.commercetools.api.models.project.BusinessUnitSearchStatus.findEnum("Activated")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeBusinessUnitStatusOnCreationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeBusinessUnitStatusOnCreationActionTest.java
index 87ff6309a31..fa7d4bd1062 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeBusinessUnitStatusOnCreationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeBusinessUnitStatusOnCreationActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeBusinessUnitStatusOnCreationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeBusinessUnitStatusOnCreationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeBusinessUnitStatusOnCreationActionBuilder builder) {
         ProjectChangeBusinessUnitStatusOnCreationAction projectChangeBusinessUnitStatusOnCreationAction = builder
                 .buildUnchecked();
         Assertions.assertThat(projectChangeBusinessUnitStatusOnCreationAction)
                 .isInstanceOf(ProjectChangeBusinessUnitStatusOnCreationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectChangeBusinessUnitStatusOnCreationAction.builder()
+        return new Object[][] { new Object[] { "status", ProjectChangeBusinessUnitStatusOnCreationAction.builder()
                 .status(com.commercetools.api.models.project.BusinessUnitConfigurationStatus.findEnum("Active")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCartsConfigurationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCartsConfigurationActionTest.java
index 62fe880700f..a0f7a27fdec 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCartsConfigurationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCartsConfigurationActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeCartsConfigurationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeCartsConfigurationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeCartsConfigurationActionBuilder builder) {
         ProjectChangeCartsConfigurationAction projectChangeCartsConfigurationAction = builder.buildUnchecked();
         Assertions.assertThat(projectChangeCartsConfigurationAction)
                 .isInstanceOf(ProjectChangeCartsConfigurationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectChangeCartsConfigurationAction.builder()
+        return new Object[][] { new Object[] { "cartsConfiguration", ProjectChangeCartsConfigurationAction.builder()
                 .cartsConfiguration(new com.commercetools.api.models.project.CartsConfigurationImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCountriesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCountriesActionTest.java
index 6012b45b6dd..39e7ca9c921 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCountriesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCountriesActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeCountriesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeCountriesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeCountriesActionBuilder builder) {
         ProjectChangeCountriesAction projectChangeCountriesAction = builder.buildUnchecked();
         Assertions.assertThat(projectChangeCountriesAction).isInstanceOf(ProjectChangeCountriesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "countries",
                 ProjectChangeCountriesAction.builder().countries(Collections.singletonList("countries")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCountryTaxRateFallbackEnabledActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCountryTaxRateFallbackEnabledActionTest.java
index 97290ae080e..12fb257be72 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCountryTaxRateFallbackEnabledActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCountryTaxRateFallbackEnabledActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeCountryTaxRateFallbackEnabledActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeCountryTaxRateFallbackEnabledActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeCountryTaxRateFallbackEnabledActionBuilder builder) {
         ProjectChangeCountryTaxRateFallbackEnabledAction projectChangeCountryTaxRateFallbackEnabledAction = builder
                 .buildUnchecked();
         Assertions.assertThat(projectChangeCountryTaxRateFallbackEnabledAction)
                 .isInstanceOf(ProjectChangeCountryTaxRateFallbackEnabledAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "countryTaxRateFallbackEnabled",
                 ProjectChangeCountryTaxRateFallbackEnabledAction.builder().countryTaxRateFallbackEnabled(true) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCurrenciesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCurrenciesActionTest.java
index d23cd6e5e4f..cb23af8bbb7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCurrenciesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCurrenciesActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeCurrenciesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeCurrenciesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeCurrenciesActionBuilder builder) {
         ProjectChangeCurrenciesAction projectChangeCurrenciesAction = builder.buildUnchecked();
         Assertions.assertThat(projectChangeCurrenciesAction).isInstanceOf(ProjectChangeCurrenciesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "currencies",
                 ProjectChangeCurrenciesAction.builder().currencies(Collections.singletonList("currencies")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCustomerSearchStatusActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCustomerSearchStatusActionTest.java
index 11f6cd06d7b..f7f83af321c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCustomerSearchStatusActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeCustomerSearchStatusActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeCustomerSearchStatusActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeCustomerSearchStatusActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeCustomerSearchStatusActionBuilder builder) {
         ProjectChangeCustomerSearchStatusAction projectChangeCustomerSearchStatusAction = builder.buildUnchecked();
         Assertions.assertThat(projectChangeCustomerSearchStatusAction)
                 .isInstanceOf(ProjectChangeCustomerSearchStatusAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectChangeCustomerSearchStatusAction.builder()
+        return new Object[][] { new Object[] { "status", ProjectChangeCustomerSearchStatusAction.builder()
                 .status(com.commercetools.api.models.project.CustomerSearchStatus.findEnum("Activated")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeLanguagesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeLanguagesActionTest.java
index e6063ad274a..916a11e1d0e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeLanguagesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeLanguagesActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeLanguagesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeLanguagesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeLanguagesActionBuilder builder) {
         ProjectChangeLanguagesAction projectChangeLanguagesAction = builder.buildUnchecked();
         Assertions.assertThat(projectChangeLanguagesAction).isInstanceOf(ProjectChangeLanguagesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "languages",
                 ProjectChangeLanguagesAction.builder().languages(Collections.singletonList("languages")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeMessagesConfigurationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeMessagesConfigurationActionTest.java
index 6822d3fd6a0..2ea5435ec79 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeMessagesConfigurationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeMessagesConfigurationActionTest.java
@@ -1,32 +1,26 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeMessagesConfigurationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeMessagesConfigurationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeMessagesConfigurationActionBuilder builder) {
         ProjectChangeMessagesConfigurationAction projectChangeMessagesConfigurationAction = builder.buildUnchecked();
         Assertions.assertThat(projectChangeMessagesConfigurationAction)
                 .isInstanceOf(ProjectChangeMessagesConfigurationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectChangeMessagesConfigurationAction.builder()
-                .messagesConfiguration(new com.commercetools.api.models.message.MessagesConfigurationDraftImpl()) } };
+        return new Object[][] { new Object[] { "messagesConfiguration",
+                ProjectChangeMessagesConfigurationAction.builder()
+                        .messagesConfiguration(
+                            new com.commercetools.api.models.message.MessagesConfigurationDraftImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeNameActionTest.java
index a27d1b4548e..ae14264e9b2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeNameActionBuilder builder) {
         ProjectChangeNameAction projectChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(projectChangeNameAction).isInstanceOf(ProjectChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectChangeNameAction.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", ProjectChangeNameAction.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeOrderSearchStatusActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeOrderSearchStatusActionTest.java
index 9f452fff0a7..6d3abd3f891 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeOrderSearchStatusActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeOrderSearchStatusActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeOrderSearchStatusActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeOrderSearchStatusActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeOrderSearchStatusActionBuilder builder) {
         ProjectChangeOrderSearchStatusAction projectChangeOrderSearchStatusAction = builder.buildUnchecked();
         Assertions.assertThat(projectChangeOrderSearchStatusAction)
                 .isInstanceOf(ProjectChangeOrderSearchStatusAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectChangeOrderSearchStatusAction.builder()
+        return new Object[][] { new Object[] { "status", ProjectChangeOrderSearchStatusAction.builder()
                 .status(com.commercetools.api.models.project.OrderSearchStatus.findEnum("Activated")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeProductSearchIndexingEnabledActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeProductSearchIndexingEnabledActionTest.java
index 4726dfabb39..ea6fa6c9314 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeProductSearchIndexingEnabledActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeProductSearchIndexingEnabledActionTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeProductSearchIndexingEnabledActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeProductSearchIndexingEnabledActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeProductSearchIndexingEnabledActionBuilder builder) {
         ProjectChangeProductSearchIndexingEnabledAction projectChangeProductSearchIndexingEnabledAction = builder
                 .buildUnchecked();
         Assertions.assertThat(projectChangeProductSearchIndexingEnabledAction)
                 .isInstanceOf(ProjectChangeProductSearchIndexingEnabledAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProjectChangeProductSearchIndexingEnabledAction.builder().enabled(true) },
-                new Object[] { ProjectChangeProductSearchIndexingEnabledAction.builder()
-                        .mode(com.commercetools.api.models.project.ProductSearchIndexingMode
-                                .findEnum("ProductProjectionsSearch")) } };
+                new Object[] { "enabled", ProjectChangeProductSearchIndexingEnabledAction.builder().enabled(true) },
+                new Object[] { "mode",
+                        ProjectChangeProductSearchIndexingEnabledAction.builder()
+                                .mode(com.commercetools.api.models.project.ProductSearchIndexingMode
+                                        .findEnum("ProductProjectionsSearch")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeShoppingListsConfigurationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeShoppingListsConfigurationActionTest.java
index dbe4b42047e..91680f2c0fa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeShoppingListsConfigurationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectChangeShoppingListsConfigurationActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectChangeShoppingListsConfigurationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectChangeShoppingListsConfigurationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectChangeShoppingListsConfigurationActionBuilder builder) {
         ProjectChangeShoppingListsConfigurationAction projectChangeShoppingListsConfigurationAction = builder
                 .buildUnchecked();
         Assertions.assertThat(projectChangeShoppingListsConfigurationAction)
                 .isInstanceOf(ProjectChangeShoppingListsConfigurationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectChangeShoppingListsConfigurationAction.builder()
-                .shoppingListsConfiguration(
-                    new com.commercetools.api.models.project.ShoppingListsConfigurationImpl()) } };
+        return new Object[][] { new Object[] { "shoppingListsConfiguration",
+                ProjectChangeShoppingListsConfigurationAction.builder()
+                        .shoppingListsConfiguration(
+                            new com.commercetools.api.models.project.ShoppingListsConfigurationImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectSetBusinessUnitAssociateRoleOnCreationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectSetBusinessUnitAssociateRoleOnCreationActionTest.java
index 2f35312c9f3..1c857e553ae 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectSetBusinessUnitAssociateRoleOnCreationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectSetBusinessUnitAssociateRoleOnCreationActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectSetBusinessUnitAssociateRoleOnCreationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectSetBusinessUnitAssociateRoleOnCreationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectSetBusinessUnitAssociateRoleOnCreationActionBuilder builder) {
         ProjectSetBusinessUnitAssociateRoleOnCreationAction projectSetBusinessUnitAssociateRoleOnCreationAction = builder
                 .buildUnchecked();
         Assertions.assertThat(projectSetBusinessUnitAssociateRoleOnCreationAction)
                 .isInstanceOf(ProjectSetBusinessUnitAssociateRoleOnCreationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectSetBusinessUnitAssociateRoleOnCreationAction.builder()
-                .associateRole(
-                    new com.commercetools.api.models.associate_role.AssociateRoleResourceIdentifierImpl()) } };
+        return new Object[][] { new Object[] { "associateRole",
+                ProjectSetBusinessUnitAssociateRoleOnCreationAction.builder()
+                        .associateRole(
+                            new com.commercetools.api.models.associate_role.AssociateRoleResourceIdentifierImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectSetExternalOAuthActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectSetExternalOAuthActionTest.java
index 0470a2fc4bb..6f7da241b9a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectSetExternalOAuthActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectSetExternalOAuthActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectSetExternalOAuthActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectSetExternalOAuthActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectSetExternalOAuthActionBuilder builder) {
         ProjectSetExternalOAuthAction projectSetExternalOAuthAction = builder.buildUnchecked();
         Assertions.assertThat(projectSetExternalOAuthAction).isInstanceOf(ProjectSetExternalOAuthAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectSetExternalOAuthAction.builder()
+        return new Object[][] { new Object[] { "externalOAuth", ProjectSetExternalOAuthAction.builder()
                 .externalOAuth(new com.commercetools.api.models.project.ExternalOAuthImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectSetShippingRateInputTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectSetShippingRateInputTypeActionTest.java
index 3f430c7048c..add1d4d367b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectSetShippingRateInputTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectSetShippingRateInputTypeActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectSetShippingRateInputTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectSetShippingRateInputTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectSetShippingRateInputTypeActionBuilder builder) {
         ProjectSetShippingRateInputTypeAction projectSetShippingRateInputTypeAction = builder.buildUnchecked();
         Assertions.assertThat(projectSetShippingRateInputTypeAction)
                 .isInstanceOf(ProjectSetShippingRateInputTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectSetShippingRateInputTypeAction.builder()
+        return new Object[][] { new Object[] { "shippingRateInputType", ProjectSetShippingRateInputTypeAction.builder()
                 .shippingRateInputType(new com.commercetools.api.models.project.ShippingRateInputTypeImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectTest.java
index f56fac9b7ad..e75a37af2e2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectTest.java
@@ -4,49 +4,43 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectBuilder builder) {
         Project project = builder.buildUnchecked();
         Assertions.assertThat(project).isInstanceOf(Project.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Project.builder().version(2L) },
-                new Object[] { Project.builder().key("key") }, new Object[] { Project.builder().name("name") },
-                new Object[] { Project.builder().countries(Collections.singletonList("countries")) },
-                new Object[] { Project.builder().currencies(Collections.singletonList("currencies")) },
-                new Object[] { Project.builder().languages(Collections.singletonList("languages")) },
-                new Object[] { Project.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Project.builder().trialUntil("trialUntil") },
-                new Object[] { Project.builder()
-                        .messages(new com.commercetools.api.models.message.MessagesConfigurationImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "version", Project.builder().version(2L) },
+                new Object[] { "key", Project.builder().key("key") },
+                new Object[] { "name", Project.builder().name("name") },
+                new Object[] { "countries", Project.builder().countries(Collections.singletonList("countries")) },
+                new Object[] { "currencies", Project.builder().currencies(Collections.singletonList("currencies")) },
+                new Object[] { "languages", Project.builder().languages(Collections.singletonList("languages")) },
+                new Object[] { "createdAt", Project.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "trialUntil", Project.builder().trialUntil("trialUntil") },
+                new Object[] { "messages",
+                        Project.builder()
+                                .messages(new com.commercetools.api.models.message.MessagesConfigurationImpl()) },
+                new Object[] { "carts",
                         Project.builder().carts(new com.commercetools.api.models.project.CartsConfigurationImpl()) },
-                new Object[] { Project.builder()
+                new Object[] { "shoppingLists", Project.builder()
                         .shoppingLists(new com.commercetools.api.models.project.ShoppingListsConfigurationImpl()) },
-                new Object[] { Project.builder()
+                new Object[] { "shippingRateInputType", Project.builder()
                         .shippingRateInputType(new com.commercetools.api.models.project.ShippingRateInputTypeImpl()) },
-                new Object[] {
+                new Object[] { "externalOAuth",
                         Project.builder().externalOAuth(new com.commercetools.api.models.project.ExternalOAuthImpl()) },
-                new Object[] { Project.builder()
+                new Object[] { "searchIndexing", Project.builder()
                         .searchIndexing(new com.commercetools.api.models.project.SearchIndexingConfigurationImpl()) },
-                new Object[] { Project.builder()
+                new Object[] { "businessUnits", Project.builder()
                         .businessUnits(new com.commercetools.api.models.project.BusinessUnitConfigurationImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectUpdateTest.java
index e5c460119da..ed20da2de1d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ProjectUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProjectUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProjectUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProjectUpdateBuilder builder) {
         ProjectUpdate projectUpdate = builder.buildUnchecked();
         Assertions.assertThat(projectUpdate).isInstanceOf(ProjectUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProjectUpdate.builder().version(2L) },
-                new Object[] { ProjectUpdate.builder()
-                        .actions(Collections
-                                .singletonList(new com.commercetools.api.models.project.ProjectUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", ProjectUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        ProjectUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.project.ProjectUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/SearchIndexingConfigurationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/SearchIndexingConfigurationTest.java
index b728fe6c530..06d5857894b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/SearchIndexingConfigurationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/SearchIndexingConfigurationTest.java
@@ -1,40 +1,33 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchIndexingConfigurationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchIndexingConfigurationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchIndexingConfigurationBuilder builder) {
         SearchIndexingConfiguration searchIndexingConfiguration = builder.buildUnchecked();
         Assertions.assertThat(searchIndexingConfiguration).isInstanceOf(SearchIndexingConfiguration.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { SearchIndexingConfiguration.builder()
+                new Object[] { "products", SearchIndexingConfiguration.builder()
                         .products(new com.commercetools.api.models.project.SearchIndexingConfigurationValuesImpl()) },
-                new Object[] { SearchIndexingConfiguration.builder()
-                        .productsSearch(
-                            new com.commercetools.api.models.project.SearchIndexingConfigurationValuesImpl()) },
-                new Object[] { SearchIndexingConfiguration.builder()
+                new Object[] { "productsSearch",
+                        SearchIndexingConfiguration.builder()
+                                .productsSearch(
+                                    new com.commercetools.api.models.project.SearchIndexingConfigurationValuesImpl()) },
+                new Object[] { "orders", SearchIndexingConfiguration.builder()
                         .orders(new com.commercetools.api.models.project.SearchIndexingConfigurationValuesImpl()) },
-                new Object[] { SearchIndexingConfiguration.builder()
+                new Object[] { "customers", SearchIndexingConfiguration.builder()
                         .customers(new com.commercetools.api.models.project.SearchIndexingConfigurationValuesImpl()) },
-                new Object[] { SearchIndexingConfiguration.builder()
+                new Object[] { "businessUnits", SearchIndexingConfiguration.builder()
                         .businessUnits(
                             new com.commercetools.api.models.project.SearchIndexingConfigurationValuesImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/SearchIndexingConfigurationValuesTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/SearchIndexingConfigurationValuesTest.java
index 3ede0519401..3ef89010467 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/SearchIndexingConfigurationValuesTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/SearchIndexingConfigurationValuesTest.java
@@ -3,36 +3,30 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchIndexingConfigurationValuesTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchIndexingConfigurationValuesBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchIndexingConfigurationValuesBuilder builder) {
         SearchIndexingConfigurationValues searchIndexingConfigurationValues = builder.buildUnchecked();
         Assertions.assertThat(searchIndexingConfigurationValues).isInstanceOf(SearchIndexingConfigurationValues.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { SearchIndexingConfigurationValues.builder()
-                        .status(com.commercetools.api.models.project.SearchIndexingConfigurationStatus
-                                .findEnum("Activated")) },
-                new Object[] { SearchIndexingConfigurationValues.builder()
-                        .lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { SearchIndexingConfigurationValues.builder()
+                new Object[] { "status",
+                        SearchIndexingConfigurationValues.builder()
+                                .status(com.commercetools.api.models.project.SearchIndexingConfigurationStatus
+                                        .findEnum("Activated")) },
+                new Object[] { "lastModifiedAt",
+                        SearchIndexingConfigurationValues.builder()
+                                .lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy", SearchIndexingConfigurationValues.builder()
                         .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ShoppingListsConfigurationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ShoppingListsConfigurationTest.java
index 0a1ed1cae77..88181114232 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ShoppingListsConfigurationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/project/ShoppingListsConfigurationTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.project;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListsConfigurationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListsConfigurationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListsConfigurationBuilder builder) {
         ShoppingListsConfiguration shoppingListsConfiguration = builder.buildUnchecked();
         Assertions.assertThat(shoppingListsConfiguration).isInstanceOf(ShoppingListsConfiguration.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { ShoppingListsConfiguration.builder().deleteDaysAfterLastModification(3L) } };
+        return new Object[][] { new Object[] { "deleteDaysAfterLastModification",
+                ShoppingListsConfiguration.builder().deleteDaysAfterLastModification(3L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteChangeCustomerActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteChangeCustomerActionTest.java
index f4f2ae1dc5d..24bfa90db2b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteChangeCustomerActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteChangeCustomerActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteChangeCustomerActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteChangeCustomerActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteChangeCustomerActionBuilder builder) {
         QuoteChangeCustomerAction quoteChangeCustomerAction = builder.buildUnchecked();
         Assertions.assertThat(quoteChangeCustomerAction).isInstanceOf(QuoteChangeCustomerAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteChangeCustomerAction.builder()
+        return new Object[][] { new Object[] { "customer", QuoteChangeCustomerAction.builder()
                 .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteChangeQuoteStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteChangeQuoteStateActionTest.java
index ec718909f36..a8d8a6480d2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteChangeQuoteStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteChangeQuoteStateActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteChangeQuoteStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteChangeQuoteStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteChangeQuoteStateActionBuilder builder) {
         QuoteChangeQuoteStateAction quoteChangeQuoteStateAction = builder.buildUnchecked();
         Assertions.assertThat(quoteChangeQuoteStateAction).isInstanceOf(QuoteChangeQuoteStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteChangeQuoteStateAction.builder()
+        return new Object[][] { new Object[] { "quoteState", QuoteChangeQuoteStateAction.builder()
                 .quoteState(com.commercetools.api.models.quote.QuoteState.findEnum("Pending")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteDraftTest.java
index a0fc83f7f34..e748c450c00 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteDraftTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.api.models.quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteDraftBuilder builder) {
         QuoteDraft quoteDraft = builder.buildUnchecked();
         Assertions.assertThat(quoteDraft).isInstanceOf(QuoteDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteDraft.builder().key("key") }, new Object[] { QuoteDraft.builder()
-                .stagedQuote(new com.commercetools.api.models.staged_quote.StagedQuoteResourceIdentifierImpl()) },
-                new Object[] { QuoteDraft.builder().stagedQuoteVersion(8L) },
-                new Object[] { QuoteDraft.builder().stagedQuoteStateToSent(true) },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", QuoteDraft.builder().key("key") },
+                new Object[] { "stagedQuote", QuoteDraft.builder()
+                        .stagedQuote(
+                            new com.commercetools.api.models.staged_quote.StagedQuoteResourceIdentifierImpl()) },
+                new Object[] { "stagedQuoteVersion", QuoteDraft.builder().stagedQuoteVersion(8L) },
+                new Object[] { "stagedQuoteStateToSent", QuoteDraft.builder().stagedQuoteStateToSent(true) },
+                new Object[] { "state",
                         QuoteDraft.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] {
+                new Object[] { "custom",
                         QuoteDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuotePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuotePagedQueryResponseTest.java
index f60afce49b1..bd9fd91d8e5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuotePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuotePagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuotePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuotePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuotePagedQueryResponseBuilder builder) {
         QuotePagedQueryResponse quotePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(quotePagedQueryResponse).isInstanceOf(QuotePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuotePagedQueryResponse.builder().limit(7L) },
-                new Object[] { QuotePagedQueryResponse.builder().offset(3L) },
-                new Object[] { QuotePagedQueryResponse.builder().count(2L) },
-                new Object[] { QuotePagedQueryResponse.builder().total(1L) },
-                new Object[] { QuotePagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", QuotePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", QuotePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", QuotePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", QuotePagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", QuotePagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.quote.QuoteImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteReferenceTest.java
index 109ad653687..0664d27215e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteReferenceTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteReferenceBuilder builder) {
         QuoteReference quoteReference = builder.buildUnchecked();
         Assertions.assertThat(quoteReference).isInstanceOf(QuoteReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { QuoteReference.builder().obj(new com.commercetools.api.models.quote.QuoteImpl()) } };
+        return new Object[][] { new Object[] { "obj",
+                QuoteReference.builder().obj(new com.commercetools.api.models.quote.QuoteImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteRequestQuoteRenegotiationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteRequestQuoteRenegotiationActionTest.java
index b9dc18ab39b..609565a1734 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteRequestQuoteRenegotiationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteRequestQuoteRenegotiationActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestQuoteRenegotiationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestQuoteRenegotiationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestQuoteRenegotiationActionBuilder builder) {
         QuoteRequestQuoteRenegotiationAction quoteRequestQuoteRenegotiationAction = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestQuoteRenegotiationAction)
                 .isInstanceOf(QuoteRequestQuoteRenegotiationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { QuoteRequestQuoteRenegotiationAction.builder().buyerComment("buyerComment") } };
+        return new Object[][] { new Object[] { "buyerComment",
+                QuoteRequestQuoteRenegotiationAction.builder().buyerComment("buyerComment") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteResourceIdentifierTest.java
index 8fc3119218d..927e4de020a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteResourceIdentifierTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.quote;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteResourceIdentifierTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteSetCustomFieldActionTest.java
index c2f4a623f9e..b534c5a80d5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteSetCustomFieldActionBuilder builder) {
         QuoteSetCustomFieldAction quoteSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(quoteSetCustomFieldAction).isInstanceOf(QuoteSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteSetCustomFieldAction.builder().name("name") },
-                new Object[] { QuoteSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", QuoteSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", QuoteSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteSetCustomTypeActionTest.java
index b663d6590d3..cfafa523d46 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteSetCustomTypeActionBuilder builder) {
         QuoteSetCustomTypeAction quoteSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(quoteSetCustomTypeAction).isInstanceOf(QuoteSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { QuoteSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        QuoteSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", QuoteSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteTest.java
index 4fccc49dd8b..5c2f60bdb56 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteTest.java
@@ -4,87 +4,97 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteBuilder builder) {
         Quote quote = builder.buildUnchecked();
         Assertions.assertThat(quote).isInstanceOf(Quote.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Quote.builder().id("id") }, new Object[] { Quote.builder().version(2L) },
-                new Object[] { Quote.builder().key("key") },
-                new Object[] { Quote.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Quote.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Quote.builder().id("id") },
+                new Object[] { "version", Quote.builder().version(2L) },
+                new Object[] { "key", Quote.builder().key("key") },
+                new Object[] { "createdAt", Quote.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Quote.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
                         Quote.builder().lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Quote.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { Quote.builder()
+                new Object[] { "createdBy",
+                        Quote.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
+                new Object[] { "quoteRequest", Quote.builder()
                         .quoteRequest(new com.commercetools.api.models.quote_request.QuoteRequestReferenceImpl()) },
-                new Object[] { Quote.builder()
+                new Object[] { "stagedQuote", Quote.builder()
                         .stagedQuote(new com.commercetools.api.models.staged_quote.StagedQuoteReferenceImpl()) },
-                new Object[] {
+                new Object[] { "customer",
                         Quote.builder().customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { Quote.builder()
+                new Object[] { "customerGroup", Quote.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] { Quote.builder().validTo(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Quote.builder().sellerComment("sellerComment") },
-                new Object[] { Quote.builder().buyerComment("buyerComment") },
-                new Object[] { Quote.builder().store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { Quote.builder()
+                new Object[] { "validTo", Quote.builder().validTo(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "sellerComment", Quote.builder().sellerComment("sellerComment") },
+                new Object[] { "buyerComment", Quote.builder().buyerComment("buyerComment") },
+                new Object[] { "store",
+                        Quote.builder().store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
+                new Object[] { "lineItems", Quote.builder()
                         .lineItems(Collections.singletonList(new com.commercetools.api.models.cart.LineItemImpl())) },
-                new Object[] {
+                new Object[] { "customLineItems",
                         Quote.builder()
                                 .customLineItems(Collections
                                         .singletonList(new com.commercetools.api.models.cart.CustomLineItemImpl())) },
-                new Object[] { Quote.builder().totalPrice(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] { Quote.builder().taxedPrice(new com.commercetools.api.models.cart.TaxedPriceImpl()) },
-                new Object[] { Quote.builder().shippingAddress(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { Quote.builder().billingAddress(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { Quote.builder()
-                        .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
-                new Object[] {
+                new Object[] { "totalPrice",
+                        Quote.builder().totalPrice(new com.commercetools.api.models.common.TypedMoneyImpl()) },
+                new Object[] { "taxedPrice",
+                        Quote.builder().taxedPrice(new com.commercetools.api.models.cart.TaxedPriceImpl()) },
+                new Object[] { "shippingAddress",
+                        Quote.builder().shippingAddress(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "billingAddress",
+                        Quote.builder().billingAddress(new com.commercetools.api.models.common.AddressImpl()) },
+                new Object[] { "inventoryMode",
+                        Quote.builder()
+                                .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
+                new Object[] { "taxMode",
                         Quote.builder().taxMode(com.commercetools.api.models.cart.TaxMode.findEnum("Platform")) },
-                new Object[] { Quote.builder()
-                        .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) },
-                new Object[] { Quote.builder()
-                        .taxCalculationMode(
-                            com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) },
-                new Object[] { Quote.builder().country("country") },
-                new Object[] { Quote.builder().shippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) },
-                new Object[] { Quote.builder().paymentInfo(new com.commercetools.api.models.order.PaymentInfoImpl()) },
-                new Object[] { Quote.builder()
-                        .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
-                new Object[] { Quote.builder()
-                        .itemShippingAddresses(
-                            Collections.singletonList(new com.commercetools.api.models.common.AddressImpl())) },
-                new Object[] {
+                new Object[] { "taxRoundingMode",
+                        Quote.builder()
+                                .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) },
+                new Object[] { "taxCalculationMode",
+                        Quote.builder()
+                                .taxCalculationMode(
+                                    com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) },
+                new Object[] { "country", Quote.builder().country("country") },
+                new Object[] { "shippingInfo",
+                        Quote.builder().shippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) },
+                new Object[] { "paymentInfo",
+                        Quote.builder().paymentInfo(new com.commercetools.api.models.order.PaymentInfoImpl()) },
+                new Object[] { "shippingRateInput",
+                        Quote.builder()
+                                .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
+                new Object[] { "itemShippingAddresses",
+                        Quote.builder()
+                                .itemShippingAddresses(
+                                    Collections.singletonList(new com.commercetools.api.models.common.AddressImpl())) },
+                new Object[] { "directDiscounts",
                         Quote.builder()
                                 .directDiscounts(Collections
                                         .singletonList(new com.commercetools.api.models.cart.DirectDiscountImpl())) },
-                new Object[] { Quote.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] {
+                new Object[] { "custom",
+                        Quote.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "quoteState",
                         Quote.builder().quoteState(com.commercetools.api.models.quote.QuoteState.findEnum("Pending")) },
-                new Object[] { Quote.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { Quote.builder().purchaseOrderNumber("purchaseOrderNumber") },
-                new Object[] { Quote.builder()
-                        .businessUnit(
-                            new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
+                new Object[] { "state",
+                        Quote.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "purchaseOrderNumber", Quote.builder().purchaseOrderNumber("purchaseOrderNumber") },
+                new Object[] { "businessUnit",
+                        Quote.builder()
+                                .businessUnit(
+                                    new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteTransitionStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteTransitionStateActionTest.java
index 93b802f3116..3743e17ff2a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteTransitionStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteTransitionStateActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteTransitionStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteTransitionStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteTransitionStateActionBuilder builder) {
         QuoteTransitionStateAction quoteTransitionStateAction = builder.buildUnchecked();
         Assertions.assertThat(quoteTransitionStateAction).isInstanceOf(QuoteTransitionStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteTransitionStateAction.builder()
-                        .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { QuoteTransitionStateAction.builder().force(true) } };
+                new Object[] { "state",
+                        QuoteTransitionStateAction.builder()
+                                .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "force", QuoteTransitionStateAction.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteUpdateTest.java
index b6ec9fdd4c0..3b4ffe17c3d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote/QuoteUpdateTest.java
@@ -3,31 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteUpdateBuilder builder) {
         QuoteUpdate quoteUpdate = builder.buildUnchecked();
         Assertions.assertThat(quoteUpdate).isInstanceOf(QuoteUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteUpdate.builder().version(2L) }, new Object[] { QuoteUpdate.builder()
-                .actions(Collections.singletonList(new com.commercetools.api.models.quote.QuoteUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", QuoteUpdate.builder().version(2L) }, new Object[] { "actions",
+                QuoteUpdate.builder()
+                        .actions(Collections
+                                .singletonList(new com.commercetools.api.models.quote.QuoteUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestChangeCustomerActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestChangeCustomerActionTest.java
index 477dfd4fabc..34db62272db 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestChangeCustomerActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestChangeCustomerActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.quote_request;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestChangeCustomerActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestChangeCustomerActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestChangeCustomerActionBuilder builder) {
         QuoteRequestChangeCustomerAction quoteRequestChangeCustomerAction = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestChangeCustomerAction).isInstanceOf(QuoteRequestChangeCustomerAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteRequestChangeCustomerAction.builder()
+        return new Object[][] { new Object[] { "customer", QuoteRequestChangeCustomerAction.builder()
                 .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestChangeQuoteRequestStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestChangeQuoteRequestStateActionTest.java
index 229607aa5b4..d649206344e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestChangeQuoteRequestStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestChangeQuoteRequestStateActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.quote_request;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestChangeQuoteRequestStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestChangeQuoteRequestStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestChangeQuoteRequestStateActionBuilder builder) {
         QuoteRequestChangeQuoteRequestStateAction quoteRequestChangeQuoteRequestStateAction = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestChangeQuoteRequestStateAction)
                 .isInstanceOf(QuoteRequestChangeQuoteRequestStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteRequestChangeQuoteRequestStateAction.builder()
-                .quoteRequestState(
-                    com.commercetools.api.models.quote_request.QuoteRequestState.findEnum("Submitted")) } };
+        return new Object[][] { new Object[] { "quoteRequestState",
+                QuoteRequestChangeQuoteRequestStateAction.builder()
+                        .quoteRequestState(
+                            com.commercetools.api.models.quote_request.QuoteRequestState.findEnum("Submitted")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestDraftTest.java
index ceaffe86322..7df9d232787 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestDraftTest.java
@@ -1,40 +1,36 @@
 
 package com.commercetools.api.models.quote_request;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestDraftBuilder builder) {
         QuoteRequestDraft quoteRequestDraft = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestDraft).isInstanceOf(QuoteRequestDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteRequestDraft.builder()
-                        .cart(new com.commercetools.api.models.cart.CartResourceIdentifierImpl()) },
-                new Object[] { QuoteRequestDraft.builder().cartVersion(7L) },
-                new Object[] { QuoteRequestDraft.builder().key("key") },
-                new Object[] { QuoteRequestDraft.builder().comment("comment") },
-                new Object[] { QuoteRequestDraft.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { QuoteRequestDraft.builder()
-                        .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { QuoteRequestDraft.builder().purchaseOrderNumber("purchaseOrderNumber") } };
+                new Object[] { "cart",
+                        QuoteRequestDraft.builder()
+                                .cart(new com.commercetools.api.models.cart.CartResourceIdentifierImpl()) },
+                new Object[] { "cartVersion", QuoteRequestDraft.builder().cartVersion(7L) },
+                new Object[] { "key", QuoteRequestDraft.builder().key("key") },
+                new Object[] { "comment", QuoteRequestDraft.builder().comment("comment") },
+                new Object[] { "custom",
+                        QuoteRequestDraft.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "state",
+                        QuoteRequestDraft.builder()
+                                .state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "purchaseOrderNumber",
+                        QuoteRequestDraft.builder().purchaseOrderNumber("purchaseOrderNumber") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestPagedQueryResponseTest.java
index 58b456413f9..3ace700e89b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestPagedQueryResponseBuilder builder) {
         QuoteRequestPagedQueryResponse quoteRequestPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestPagedQueryResponse).isInstanceOf(QuoteRequestPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteRequestPagedQueryResponse.builder().limit(7L) },
-                new Object[] { QuoteRequestPagedQueryResponse.builder().offset(3L) },
-                new Object[] { QuoteRequestPagedQueryResponse.builder().count(2L) },
-                new Object[] { QuoteRequestPagedQueryResponse.builder().total(1L) },
-                new Object[] { QuoteRequestPagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.quote_request.QuoteRequestImpl())) } };
+        return new Object[][] { new Object[] { "limit", QuoteRequestPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", QuoteRequestPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", QuoteRequestPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", QuoteRequestPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        QuoteRequestPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.quote_request.QuoteRequestImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestReferenceTest.java
index ce8f4aa505d..c33229efbdc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestReferenceTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.quote_request;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestReferenceBuilder builder) {
         QuoteRequestReference quoteRequestReference = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestReference).isInstanceOf(QuoteRequestReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteRequestReference.builder()
+        return new Object[][] { new Object[] { "obj", QuoteRequestReference.builder()
                 .obj(new com.commercetools.api.models.quote_request.QuoteRequestImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestResourceIdentifierTest.java
index 349ed71dad4..28ee3d6410b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestResourceIdentifierTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.quote_request;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestResourceIdentifierTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestSetCustomFieldActionTest.java
index cd6711fb02e..32d2ba93ae8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.quote_request;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestSetCustomFieldActionBuilder builder) {
         QuoteRequestSetCustomFieldAction quoteRequestSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestSetCustomFieldAction).isInstanceOf(QuoteRequestSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteRequestSetCustomFieldAction.builder().name("name") },
-                new Object[] { QuoteRequestSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", QuoteRequestSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", QuoteRequestSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestSetCustomTypeActionTest.java
index 6d27025924a..4d910459922 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.quote_request;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestSetCustomTypeActionBuilder builder) {
         QuoteRequestSetCustomTypeAction quoteRequestSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestSetCustomTypeAction).isInstanceOf(QuoteRequestSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteRequestSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { QuoteRequestSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        QuoteRequestSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", QuoteRequestSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestTest.java
index 33179ebcabf..908638da473 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestTest.java
@@ -4,94 +4,100 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestBuilder builder) {
         QuoteRequest quoteRequest = builder.buildUnchecked();
         Assertions.assertThat(quoteRequest).isInstanceOf(QuoteRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteRequest.builder().id("id") },
-                new Object[] { QuoteRequest.builder().version(2L) }, new Object[] { QuoteRequest.builder().key("key") },
-                new Object[] { QuoteRequest.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { QuoteRequest.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { QuoteRequest.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", QuoteRequest.builder().id("id") },
+                new Object[] { "version", QuoteRequest.builder().version(2L) },
+                new Object[] { "key", QuoteRequest.builder().key("key") },
+                new Object[] { "createdAt",
+                        QuoteRequest.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        QuoteRequest.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        QuoteRequest.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         QuoteRequest.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] {
+                new Object[] { "quoteRequestState",
                         QuoteRequest.builder()
                                 .quoteRequestState(com.commercetools.api.models.quote_request.QuoteRequestState
                                         .findEnum("Submitted")) },
-                new Object[] { QuoteRequest.builder().comment("comment") },
-                new Object[] { QuoteRequest.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { QuoteRequest.builder()
+                new Object[] { "comment", QuoteRequest.builder().comment("comment") },
+                new Object[] { "customer",
+                        QuoteRequest.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "customerGroup", QuoteRequest.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] {
+                new Object[] { "store",
                         QuoteRequest.builder().store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { QuoteRequest.builder()
+                new Object[] { "lineItems", QuoteRequest.builder()
                         .lineItems(Collections.singletonList(new com.commercetools.api.models.cart.LineItemImpl())) },
-                new Object[] {
+                new Object[] { "customLineItems",
                         QuoteRequest.builder()
                                 .customLineItems(Collections
                                         .singletonList(new com.commercetools.api.models.cart.CustomLineItemImpl())) },
-                new Object[] {
+                new Object[] { "totalPrice",
                         QuoteRequest.builder().totalPrice(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] {
+                new Object[] { "taxedPrice",
                         QuoteRequest.builder().taxedPrice(new com.commercetools.api.models.cart.TaxedPriceImpl()) },
-                new Object[] {
+                new Object[] { "shippingAddress",
                         QuoteRequest.builder().shippingAddress(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] {
+                new Object[] { "billingAddress",
                         QuoteRequest.builder().billingAddress(new com.commercetools.api.models.common.AddressImpl()) },
-                new Object[] { QuoteRequest.builder()
-                        .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
-                new Object[] { QuoteRequest.builder()
-                        .taxMode(com.commercetools.api.models.cart.TaxMode.findEnum("Platform")) },
-                new Object[] { QuoteRequest.builder()
-                        .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) },
-                new Object[] { QuoteRequest.builder()
-                        .taxCalculationMode(
-                            com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) },
-                new Object[] { QuoteRequest.builder().country("country") },
-                new Object[] {
+                new Object[] { "inventoryMode",
+                        QuoteRequest.builder()
+                                .inventoryMode(com.commercetools.api.models.cart.InventoryMode.findEnum("None")) },
+                new Object[] { "taxMode",
+                        QuoteRequest.builder()
+                                .taxMode(com.commercetools.api.models.cart.TaxMode.findEnum("Platform")) },
+                new Object[] { "taxRoundingMode",
+                        QuoteRequest.builder()
+                                .taxRoundingMode(com.commercetools.api.models.cart.RoundingMode.findEnum("HalfEven")) },
+                new Object[] { "taxCalculationMode",
+                        QuoteRequest.builder()
+                                .taxCalculationMode(
+                                    com.commercetools.api.models.cart.TaxCalculationMode.findEnum("LineItemLevel")) },
+                new Object[] { "country", QuoteRequest.builder().country("country") },
+                new Object[] { "shippingInfo",
                         QuoteRequest.builder().shippingInfo(new com.commercetools.api.models.cart.ShippingInfoImpl()) },
-                new Object[] {
+                new Object[] { "paymentInfo",
                         QuoteRequest.builder().paymentInfo(new com.commercetools.api.models.order.PaymentInfoImpl()) },
-                new Object[] { QuoteRequest.builder()
-                        .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
-                new Object[] { QuoteRequest.builder()
-                        .itemShippingAddresses(
-                            Collections.singletonList(new com.commercetools.api.models.common.AddressImpl())) },
-                new Object[] {
+                new Object[] { "shippingRateInput",
+                        QuoteRequest.builder()
+                                .shippingRateInput(new com.commercetools.api.models.cart.ShippingRateInputImpl()) },
+                new Object[] { "itemShippingAddresses",
+                        QuoteRequest.builder()
+                                .itemShippingAddresses(
+                                    Collections.singletonList(new com.commercetools.api.models.common.AddressImpl())) },
+                new Object[] { "directDiscounts",
                         QuoteRequest.builder()
                                 .directDiscounts(Collections
                                         .singletonList(new com.commercetools.api.models.cart.DirectDiscountImpl())) },
-                new Object[] {
+                new Object[] { "custom",
                         QuoteRequest.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] {
+                new Object[] { "state",
                         QuoteRequest.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { QuoteRequest.builder().purchaseOrderNumber("purchaseOrderNumber") },
-                new Object[] { QuoteRequest.builder().cart(new com.commercetools.api.models.cart.CartReferenceImpl()) },
-                new Object[] { QuoteRequest.builder()
-                        .businessUnit(
-                            new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
+                new Object[] { "purchaseOrderNumber",
+                        QuoteRequest.builder().purchaseOrderNumber("purchaseOrderNumber") },
+                new Object[] { "cart",
+                        QuoteRequest.builder().cart(new com.commercetools.api.models.cart.CartReferenceImpl()) },
+                new Object[] { "businessUnit",
+                        QuoteRequest.builder()
+                                .businessUnit(
+                                    new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestTransitionStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestTransitionStateActionTest.java
index c80a2c38768..e497d65574e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestTransitionStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestTransitionStateActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.quote_request;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestTransitionStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestTransitionStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestTransitionStateActionBuilder builder) {
         QuoteRequestTransitionStateAction quoteRequestTransitionStateAction = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestTransitionStateAction).isInstanceOf(QuoteRequestTransitionStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { QuoteRequestTransitionStateAction.builder()
-                        .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { QuoteRequestTransitionStateAction.builder().force(true) } };
+                new Object[] { "state",
+                        QuoteRequestTransitionStateAction.builder()
+                                .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "force", QuoteRequestTransitionStateAction.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestUpdateTest.java
index 60af4baa545..10313ab3224 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/quote_request/QuoteRequestUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestUpdateBuilder builder) {
         QuoteRequestUpdate quoteRequestUpdate = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestUpdate).isInstanceOf(QuoteRequestUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteRequestUpdate.builder().version(2L) },
-                new Object[] { QuoteRequestUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.quote_request.QuoteRequestUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", QuoteRequestUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        QuoteRequestUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.quote_request.QuoteRequestUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewDraftTest.java
index 6e041ef96b8..234fc53992c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewDraftTest.java
@@ -1,43 +1,38 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewDraftBuilder builder) {
         ReviewDraft reviewDraft = builder.buildUnchecked();
         Assertions.assertThat(reviewDraft).isInstanceOf(ReviewDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewDraft.builder().key("key") },
-                new Object[] { ReviewDraft.builder().uniquenessValue("uniquenessValue") },
-                new Object[] { ReviewDraft.builder().locale("locale") },
-                new Object[] { ReviewDraft.builder().authorName("authorName") },
-                new Object[] { ReviewDraft.builder().title("title") },
-                new Object[] { ReviewDraft.builder().text("text") },
-                new Object[] { ReviewDraft.builder()
-                        .target(new com.commercetools.api.models.common.ResourceIdentifierImpl()) },
-                new Object[] { ReviewDraft.builder()
-                        .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { ReviewDraft.builder().rating(5) },
-                new Object[] { ReviewDraft.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", ReviewDraft.builder().key("key") },
+                new Object[] { "uniquenessValue", ReviewDraft.builder().uniquenessValue("uniquenessValue") },
+                new Object[] { "locale", ReviewDraft.builder().locale("locale") },
+                new Object[] { "authorName", ReviewDraft.builder().authorName("authorName") },
+                new Object[] { "title", ReviewDraft.builder().title("title") },
+                new Object[] { "text", ReviewDraft.builder().text("text") },
+                new Object[] { "target",
+                        ReviewDraft.builder()
+                                .target(new com.commercetools.api.models.common.ResourceIdentifierImpl()) },
+                new Object[] { "state",
+                        ReviewDraft.builder()
+                                .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "rating", ReviewDraft.builder().rating(5) },
+                new Object[] { "customer",
+                        ReviewDraft.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) },
+                new Object[] { "custom",
                         ReviewDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewPagedQueryResponseTest.java
index 76d1017f634..0b8633bbf5b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewPagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewPagedQueryResponseBuilder builder) {
         ReviewPagedQueryResponse reviewPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(reviewPagedQueryResponse).isInstanceOf(ReviewPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ReviewPagedQueryResponse.builder().count(2L) },
-                new Object[] { ReviewPagedQueryResponse.builder().total(1L) },
-                new Object[] { ReviewPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ReviewPagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", ReviewPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "count", ReviewPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ReviewPagedQueryResponse.builder().total(1L) },
+                new Object[] { "offset", ReviewPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "results", ReviewPagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.review.ReviewImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewRatingStatisticsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewRatingStatisticsTest.java
index 3b721c5cd3b..eba7560b1ad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewRatingStatisticsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewRatingStatisticsTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewRatingStatisticsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewRatingStatisticsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewRatingStatisticsBuilder builder) {
         ReviewRatingStatistics reviewRatingStatistics = builder.buildUnchecked();
         Assertions.assertThat(reviewRatingStatistics).isInstanceOf(ReviewRatingStatistics.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewRatingStatistics.builder().averageRating(0.99762577) },
-                new Object[] { ReviewRatingStatistics.builder().highestRating(0.8229182) },
-                new Object[] { ReviewRatingStatistics.builder().lowestRating(0.9610451) },
-                new Object[] { ReviewRatingStatistics.builder().count(2) },
-                new Object[] { ReviewRatingStatistics.builder().ratingsDistribution("ratingsDistribution") } };
+        return new Object[][] {
+                new Object[] { "averageRating", ReviewRatingStatistics.builder().averageRating(0.99762577) },
+                new Object[] { "highestRating", ReviewRatingStatistics.builder().highestRating(0.8229182) },
+                new Object[] { "lowestRating", ReviewRatingStatistics.builder().lowestRating(0.9610451) },
+                new Object[] { "count", ReviewRatingStatistics.builder().count(2) },
+                new Object[] { "ratingsDistribution",
+                        ReviewRatingStatistics.builder().ratingsDistribution("ratingsDistribution") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewReferenceTest.java
index f6c43d98adc..37dbfad187c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewReferenceTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewReferenceBuilder builder) {
         ReviewReference reviewReference = builder.buildUnchecked();
         Assertions.assertThat(reviewReference).isInstanceOf(ReviewReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ReviewReference.builder().obj(new com.commercetools.api.models.review.ReviewImpl()) },
-                new Object[] { ReviewReference.builder().id("id") } };
+                new Object[] { "obj",
+                        ReviewReference.builder().obj(new com.commercetools.api.models.review.ReviewImpl()) },
+                new Object[] { "id", ReviewReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewResourceIdentifierTest.java
index 0a038d7e30e..289340c3f0f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewResourceIdentifierBuilder builder) {
         ReviewResourceIdentifier reviewResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(reviewResourceIdentifier).isInstanceOf(ReviewResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewResourceIdentifier.builder().id("id") },
-                new Object[] { ReviewResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", ReviewResourceIdentifier.builder().id("id") },
+                new Object[] { "key", ReviewResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetAuthorNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetAuthorNameActionTest.java
index 530c3085ce3..9bba3fa55b5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetAuthorNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetAuthorNameActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewSetAuthorNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewSetAuthorNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewSetAuthorNameActionBuilder builder) {
         ReviewSetAuthorNameAction reviewSetAuthorNameAction = builder.buildUnchecked();
         Assertions.assertThat(reviewSetAuthorNameAction).isInstanceOf(ReviewSetAuthorNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewSetAuthorNameAction.builder().authorName("authorName") } };
+        return new Object[][] {
+                new Object[] { "authorName", ReviewSetAuthorNameAction.builder().authorName("authorName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetCustomFieldActionTest.java
index 36fd32b03b6..7f244fa9b37 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewSetCustomFieldActionBuilder builder) {
         ReviewSetCustomFieldAction reviewSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(reviewSetCustomFieldAction).isInstanceOf(ReviewSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewSetCustomFieldAction.builder().name("name") },
-                new Object[] { ReviewSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", ReviewSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ReviewSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetCustomTypeActionTest.java
index b9bcb73f4d1..dbbd804ff1b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewSetCustomTypeActionBuilder builder) {
         ReviewSetCustomTypeAction reviewSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(reviewSetCustomTypeAction).isInstanceOf(ReviewSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ReviewSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ReviewSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        ReviewSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ReviewSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetCustomerActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetCustomerActionTest.java
index 02fbf8a7080..5b94ab1eb77 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetCustomerActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetCustomerActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewSetCustomerActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewSetCustomerActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewSetCustomerActionBuilder builder) {
         ReviewSetCustomerAction reviewSetCustomerAction = builder.buildUnchecked();
         Assertions.assertThat(reviewSetCustomerAction).isInstanceOf(ReviewSetCustomerAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewSetCustomerAction.builder()
+        return new Object[][] { new Object[] { "customer", ReviewSetCustomerAction.builder()
                 .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetKeyActionTest.java
index 78570aca6c3..fe8315afa57 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewSetKeyActionBuilder builder) {
         ReviewSetKeyAction reviewSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(reviewSetKeyAction).isInstanceOf(ReviewSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ReviewSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetLocaleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetLocaleActionTest.java
index 75417e99950..771c3ba44ec 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetLocaleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetLocaleActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewSetLocaleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewSetLocaleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewSetLocaleActionBuilder builder) {
         ReviewSetLocaleAction reviewSetLocaleAction = builder.buildUnchecked();
         Assertions.assertThat(reviewSetLocaleAction).isInstanceOf(ReviewSetLocaleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewSetLocaleAction.builder().locale("locale") } };
+        return new Object[][] { new Object[] { "locale", ReviewSetLocaleAction.builder().locale("locale") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetRatingActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetRatingActionTest.java
index 8a694ef9c19..df4d9018c03 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetRatingActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetRatingActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewSetRatingActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewSetRatingActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewSetRatingActionBuilder builder) {
         ReviewSetRatingAction reviewSetRatingAction = builder.buildUnchecked();
         Assertions.assertThat(reviewSetRatingAction).isInstanceOf(ReviewSetRatingAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewSetRatingAction.builder().rating(5) } };
+        return new Object[][] { new Object[] { "rating", ReviewSetRatingAction.builder().rating(5) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetTargetActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetTargetActionTest.java
index 6d161faeb94..1da342dbff0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetTargetActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetTargetActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewSetTargetActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewSetTargetActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewSetTargetActionBuilder builder) {
         ReviewSetTargetAction reviewSetTargetAction = builder.buildUnchecked();
         Assertions.assertThat(reviewSetTargetAction).isInstanceOf(ReviewSetTargetAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewSetTargetAction.builder().target("target") } };
+        return new Object[][] { new Object[] { "target", ReviewSetTargetAction.builder().target("target") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetTextActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetTextActionTest.java
index 0d00f0a0754..7b65042c836 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetTextActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetTextActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewSetTextActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewSetTextActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewSetTextActionBuilder builder) {
         ReviewSetTextAction reviewSetTextAction = builder.buildUnchecked();
         Assertions.assertThat(reviewSetTextAction).isInstanceOf(ReviewSetTextAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewSetTextAction.builder().text("text") } };
+        return new Object[][] { new Object[] { "text", ReviewSetTextAction.builder().text("text") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetTitleActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetTitleActionTest.java
index eeb5b5cdc54..f05ef0cc62c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetTitleActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewSetTitleActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewSetTitleActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewSetTitleActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewSetTitleActionBuilder builder) {
         ReviewSetTitleAction reviewSetTitleAction = builder.buildUnchecked();
         Assertions.assertThat(reviewSetTitleAction).isInstanceOf(ReviewSetTitleAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewSetTitleAction.builder().title("title") } };
+        return new Object[][] { new Object[] { "title", ReviewSetTitleAction.builder().title("title") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewTest.java
index a122c246d69..54008031410 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewTest.java
@@ -3,48 +3,46 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewBuilder builder) {
         Review review = builder.buildUnchecked();
         Assertions.assertThat(review).isInstanceOf(Review.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Review.builder().id("id") },
-                new Object[] { Review.builder().version(2L) },
-                new Object[] { Review.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Review.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Review.builder().id("id") },
+                new Object[] { "version", Review.builder().version(2L) },
+                new Object[] { "createdAt", Review.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Review.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
                         Review.builder().lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Review.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { Review.builder().key("key") },
-                new Object[] { Review.builder().uniquenessValue("uniquenessValue") },
-                new Object[] { Review.builder().locale("locale") },
-                new Object[] { Review.builder().authorName("authorName") },
-                new Object[] { Review.builder().title("title") }, new Object[] { Review.builder().text("text") },
-                new Object[] { Review.builder().target(new com.commercetools.api.models.common.ReferenceImpl()) },
-                new Object[] { Review.builder().includedInStatistics(true) },
-                new Object[] { Review.builder().rating(5) },
-                new Object[] { Review.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] {
+                new Object[] { "createdBy",
+                        Review.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
+                new Object[] { "key", Review.builder().key("key") },
+                new Object[] { "uniquenessValue", Review.builder().uniquenessValue("uniquenessValue") },
+                new Object[] { "locale", Review.builder().locale("locale") },
+                new Object[] { "authorName", Review.builder().authorName("authorName") },
+                new Object[] { "title", Review.builder().title("title") },
+                new Object[] { "text", Review.builder().text("text") },
+                new Object[] { "target",
+                        Review.builder().target(new com.commercetools.api.models.common.ReferenceImpl()) },
+                new Object[] { "includedInStatistics", Review.builder().includedInStatistics(true) },
+                new Object[] { "rating", Review.builder().rating(5) },
+                new Object[] { "state",
+                        Review.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) },
+                new Object[] { "customer",
                         Review.builder().customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { Review.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
+                new Object[] { "custom",
+                        Review.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewTransitionStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewTransitionStateActionTest.java
index 8d500b291a5..4f0353ac1ed 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewTransitionStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewTransitionStateActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.review;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewTransitionStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewTransitionStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewTransitionStateActionBuilder builder) {
         ReviewTransitionStateAction reviewTransitionStateAction = builder.buildUnchecked();
         Assertions.assertThat(reviewTransitionStateAction).isInstanceOf(ReviewTransitionStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ReviewTransitionStateAction.builder()
-                        .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { ReviewTransitionStateAction.builder().force(true) } };
+                new Object[] { "state",
+                        ReviewTransitionStateAction.builder()
+                                .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "force", ReviewTransitionStateAction.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewUpdateTest.java
index 567f8b82f5c..88bb81d077b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/review/ReviewUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewUpdateBuilder builder) {
         ReviewUpdate reviewUpdate = builder.buildUnchecked();
         Assertions.assertThat(reviewUpdate).isInstanceOf(ReviewUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewUpdate.builder().version(2L) },
-                new Object[] { ReviewUpdate.builder()
-                        .actions(Collections
-                                .singletonList(new com.commercetools.api.models.review.ReviewUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", ReviewUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        ReviewUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.review.ReviewUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchAndExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchAndExpressionTest.java
index aeba409a3ff..7364f3f4020 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchAndExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchAndExpressionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchAndExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchAndExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchAndExpressionBuilder builder) {
         SearchAndExpression searchAndExpression = builder.buildUnchecked();
         Assertions.assertThat(searchAndExpression).isInstanceOf(SearchAndExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchAndExpression.builder()
+        return new Object[][] { new Object[] { "and", SearchAndExpression.builder()
                 .and(Collections.singletonList(new com.commercetools.api.models.search.SearchQueryImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchAnyValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchAnyValueTest.java
index b60021fc281..e7551445951 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchAnyValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchAnyValueTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchAnyValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchAnyValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchAnyValueBuilder builder) {
         SearchAnyValue searchAnyValue = builder.buildUnchecked();
         Assertions.assertThat(searchAnyValue).isInstanceOf(SearchAnyValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchAnyValue.builder().value("value") },
-                new Object[] { SearchAnyValue.builder().language("language") },
-                new Object[] { SearchAnyValue.builder().caseInsensitive(true) } };
+        return new Object[][] { new Object[] { "value", SearchAnyValue.builder().value("value") },
+                new Object[] { "language", SearchAnyValue.builder().language("language") },
+                new Object[] { "caseInsensitive", SearchAnyValue.builder().caseInsensitive(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchCompoundExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchCompoundExpressionTest.java
index 848fd7c2f4c..7d10fce1bbf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchCompoundExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchCompoundExpressionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchCompoundExpressionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateRangeExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateRangeExpressionTest.java
index f7eb6129572..a6c50ed0ffd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateRangeExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateRangeExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchDateRangeExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchDateRangeExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchDateRangeExpressionBuilder builder) {
         SearchDateRangeExpression searchDateRangeExpression = builder.buildUnchecked();
         Assertions.assertThat(searchDateRangeExpression).isInstanceOf(SearchDateRangeExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchDateRangeExpression.builder()
+        return new Object[][] { new Object[] { "range", SearchDateRangeExpression.builder()
                 .range(new com.commercetools.api.models.search.SearchDateRangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateRangeValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateRangeValueTest.java
index 68694e37612..b7473185099 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateRangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateRangeValueTest.java
@@ -3,33 +3,26 @@
 
 import java.time.LocalDate;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchDateRangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchDateRangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchDateRangeValueBuilder builder) {
         SearchDateRangeValue searchDateRangeValue = builder.buildUnchecked();
         Assertions.assertThat(searchDateRangeValue).isInstanceOf(SearchDateRangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchDateRangeValue.builder().gte(LocalDate.parse("2023-06-01")) },
-                new Object[] { SearchDateRangeValue.builder().gt(LocalDate.parse("2023-06-01")) },
-                new Object[] { SearchDateRangeValue.builder().lte(LocalDate.parse("2023-06-01")) },
-                new Object[] { SearchDateRangeValue.builder().lt(LocalDate.parse("2023-06-01")) } };
+        return new Object[][] {
+                new Object[] { "gte", SearchDateRangeValue.builder().gte(LocalDate.parse("2023-06-01")) },
+                new Object[] { "gt", SearchDateRangeValue.builder().gt(LocalDate.parse("2023-06-01")) },
+                new Object[] { "lte", SearchDateRangeValue.builder().lte(LocalDate.parse("2023-06-01")) },
+                new Object[] { "lt", SearchDateRangeValue.builder().lt(LocalDate.parse("2023-06-01")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateTimeRangeExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateTimeRangeExpressionTest.java
index 53a7f1171a9..210960fe41d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateTimeRangeExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateTimeRangeExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchDateTimeRangeExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchDateTimeRangeExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchDateTimeRangeExpressionBuilder builder) {
         SearchDateTimeRangeExpression searchDateTimeRangeExpression = builder.buildUnchecked();
         Assertions.assertThat(searchDateTimeRangeExpression).isInstanceOf(SearchDateTimeRangeExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchDateTimeRangeExpression.builder()
+        return new Object[][] { new Object[] { "range", SearchDateTimeRangeExpression.builder()
                 .range(new com.commercetools.api.models.search.SearchDateTimeRangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateTimeRangeValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateTimeRangeValueTest.java
index 30ab2b7804e..5d9f5672939 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateTimeRangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchDateTimeRangeValueTest.java
@@ -3,34 +3,29 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchDateTimeRangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchDateTimeRangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchDateTimeRangeValueBuilder builder) {
         SearchDateTimeRangeValue searchDateTimeRangeValue = builder.buildUnchecked();
         Assertions.assertThat(searchDateTimeRangeValue).isInstanceOf(SearchDateTimeRangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { SearchDateTimeRangeValue.builder().gte(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { SearchDateTimeRangeValue.builder().gt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { SearchDateTimeRangeValue.builder().lte(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { SearchDateTimeRangeValue.builder().lt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "gte",
+                        SearchDateTimeRangeValue.builder().gte(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "gt", SearchDateTimeRangeValue.builder().gt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lte",
+                        SearchDateTimeRangeValue.builder().lte(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lt",
+                        SearchDateTimeRangeValue.builder().lt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExactExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExactExpressionTest.java
index 714e5d8f679..b52b731e9e7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExactExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExactExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchExactExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchExactExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchExactExpressionBuilder builder) {
         SearchExactExpression searchExactExpression = builder.buildUnchecked();
         Assertions.assertThat(searchExactExpression).isInstanceOf(SearchExactExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchExactExpression.builder()
+        return new Object[][] { new Object[] { "exact", SearchExactExpression.builder()
                 .exact(new com.commercetools.api.models.search.SearchExactValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExactValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExactValueTest.java
index a4c166ccf02..69d09f6fa59 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExactValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExactValueTest.java
@@ -3,33 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchExactValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchExactValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchExactValueBuilder builder) {
         SearchExactValue searchExactValue = builder.buildUnchecked();
         Assertions.assertThat(searchExactValue).isInstanceOf(SearchExactValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchExactValue.builder().value("value") },
-                new Object[] { SearchExactValue.builder().values(Collections.singletonList("values")) },
-                new Object[] { SearchExactValue.builder().language("language") },
-                new Object[] { SearchExactValue.builder().caseInsensitive(true) } };
+        return new Object[][] { new Object[] { "value", SearchExactValue.builder().value("value") },
+                new Object[] { "values", SearchExactValue.builder().values(Collections.singletonList("values")) },
+                new Object[] { "language", SearchExactValue.builder().language("language") },
+                new Object[] { "caseInsensitive", SearchExactValue.builder().caseInsensitive(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExistsExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExistsExpressionTest.java
index 0af026be37a..98569a53f8a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExistsExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExistsExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchExistsExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchExistsExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchExistsExpressionBuilder builder) {
         SearchExistsExpression searchExistsExpression = builder.buildUnchecked();
         Assertions.assertThat(searchExistsExpression).isInstanceOf(SearchExistsExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchExistsExpression.builder()
+        return new Object[][] { new Object[] { "exists", SearchExistsExpression.builder()
                 .exists(new com.commercetools.api.models.search.SearchExistsValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExistsValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExistsValueTest.java
index f57c65cfae4..7c2acac882c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExistsValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchExistsValueTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchExistsValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchExistsValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchExistsValueBuilder builder) {
         SearchExistsValue searchExistsValue = builder.buildUnchecked();
         Assertions.assertThat(searchExistsValue).isInstanceOf(SearchExistsValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchExistsValue.builder().language("language") } };
+        return new Object[][] { new Object[] { "language", SearchExistsValue.builder().language("language") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFilterExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFilterExpressionTest.java
index 6dad50ca85e..acb09997ad6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFilterExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFilterExpressionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchFilterExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchFilterExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchFilterExpressionBuilder builder) {
         SearchFilterExpression searchFilterExpression = builder.buildUnchecked();
         Assertions.assertThat(searchFilterExpression).isInstanceOf(SearchFilterExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchFilterExpression.builder()
+        return new Object[][] { new Object[] { "filter", SearchFilterExpression.builder()
                 .filter(
                     Collections.singletonList(new com.commercetools.api.models.search.SearchQueryExpressionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextExpressionTest.java
index 1569985d567..a2dc8ad277c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchFullTextExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchFullTextExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchFullTextExpressionBuilder builder) {
         SearchFullTextExpression searchFullTextExpression = builder.buildUnchecked();
         Assertions.assertThat(searchFullTextExpression).isInstanceOf(SearchFullTextExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchFullTextExpression.builder()
+        return new Object[][] { new Object[] { "fullText", SearchFullTextExpression.builder()
                 .fullText(new com.commercetools.api.models.search.SearchFullTextValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextPrefixExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextPrefixExpressionTest.java
index 16794e7d027..2ecd4ab3e63 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextPrefixExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextPrefixExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchFullTextPrefixExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchFullTextPrefixExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchFullTextPrefixExpressionBuilder builder) {
         SearchFullTextPrefixExpression searchFullTextPrefixExpression = builder.buildUnchecked();
         Assertions.assertThat(searchFullTextPrefixExpression).isInstanceOf(SearchFullTextPrefixExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchFullTextPrefixExpression.builder()
+        return new Object[][] { new Object[] { "fullTextPrefix", SearchFullTextPrefixExpression.builder()
                 .fullTextPrefix(new com.commercetools.api.models.search.SearchFullTextPrefixValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextPrefixValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextPrefixValueTest.java
index 9a5c1e384ae..0714143cf51 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextPrefixValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextPrefixValueTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchFullTextPrefixValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchFullTextPrefixValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchFullTextPrefixValueBuilder builder) {
         SearchFullTextPrefixValue searchFullTextPrefixValue = builder.buildUnchecked();
         Assertions.assertThat(searchFullTextPrefixValue).isInstanceOf(SearchFullTextPrefixValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchFullTextPrefixValue.builder().value("value") },
-                new Object[] { SearchFullTextPrefixValue.builder().language("language") },
-                new Object[] { SearchFullTextPrefixValue.builder()
+        return new Object[][] { new Object[] { "value", SearchFullTextPrefixValue.builder().value("value") },
+                new Object[] { "language", SearchFullTextPrefixValue.builder().language("language") },
+                new Object[] { "mustMatch", SearchFullTextPrefixValue.builder()
                         .mustMatch(com.commercetools.api.models.search.SearchMatchType.findEnum("any")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextValueTest.java
index d2c3a3e8e23..de89dfbeb24 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchFullTextValueTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchFullTextValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchFullTextValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchFullTextValueBuilder builder) {
         SearchFullTextValue searchFullTextValue = builder.buildUnchecked();
         Assertions.assertThat(searchFullTextValue).isInstanceOf(SearchFullTextValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchFullTextValue.builder().value("value") },
-                new Object[] { SearchFullTextValue.builder().language("language") },
-                new Object[] { SearchFullTextValue.builder()
+        return new Object[][] { new Object[] { "value", SearchFullTextValue.builder().value("value") },
+                new Object[] { "language", SearchFullTextValue.builder().language("language") },
+                new Object[] { "mustMatch", SearchFullTextValue.builder()
                         .mustMatch(com.commercetools.api.models.search.SearchMatchType.findEnum("any")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchLongRangeExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchLongRangeExpressionTest.java
index 24b11550f07..4ca539c4e95 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchLongRangeExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchLongRangeExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchLongRangeExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchLongRangeExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchLongRangeExpressionBuilder builder) {
         SearchLongRangeExpression searchLongRangeExpression = builder.buildUnchecked();
         Assertions.assertThat(searchLongRangeExpression).isInstanceOf(SearchLongRangeExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchLongRangeExpression.builder()
+        return new Object[][] { new Object[] { "range", SearchLongRangeExpression.builder()
                 .range(new com.commercetools.api.models.search.SearchLongRangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchLongRangeValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchLongRangeValueTest.java
index 52469a22dd2..4dfec5ec85d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchLongRangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchLongRangeValueTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchLongRangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchLongRangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchLongRangeValueBuilder builder) {
         SearchLongRangeValue searchLongRangeValue = builder.buildUnchecked();
         Assertions.assertThat(searchLongRangeValue).isInstanceOf(SearchLongRangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchLongRangeValue.builder().gte(8L) },
-                new Object[] { SearchLongRangeValue.builder().gt(6L) },
-                new Object[] { SearchLongRangeValue.builder().lte(1L) },
-                new Object[] { SearchLongRangeValue.builder().lt(2L) } };
+        return new Object[][] { new Object[] { "gte", SearchLongRangeValue.builder().gte(8L) },
+                new Object[] { "gt", SearchLongRangeValue.builder().gt(6L) },
+                new Object[] { "lte", SearchLongRangeValue.builder().lte(1L) },
+                new Object[] { "lt", SearchLongRangeValue.builder().lt(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchMatchingVariantTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchMatchingVariantTest.java
index 5423aec32d2..95d17f7135a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchMatchingVariantTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchMatchingVariantTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchMatchingVariantTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchMatchingVariantBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchMatchingVariantBuilder builder) {
         SearchMatchingVariant searchMatchingVariant = builder.buildUnchecked();
         Assertions.assertThat(searchMatchingVariant).isInstanceOf(SearchMatchingVariant.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchMatchingVariant.builder().id(2) },
-                new Object[] { SearchMatchingVariant.builder().sku("sku") } };
+        return new Object[][] { new Object[] { "id", SearchMatchingVariant.builder().id(2) },
+                new Object[] { "sku", SearchMatchingVariant.builder().sku("sku") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchNotExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchNotExpressionTest.java
index 38969fff24d..8542b9ff00c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchNotExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchNotExpressionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchNotExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchNotExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchNotExpressionBuilder builder) {
         SearchNotExpression searchNotExpression = builder.buildUnchecked();
         Assertions.assertThat(searchNotExpression).isInstanceOf(SearchNotExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchNotExpression.builder()
+        return new Object[][] { new Object[] { "not", SearchNotExpression.builder()
                 .not(Collections.singletonList(new com.commercetools.api.models.search.SearchQueryImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchNumberRangeExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchNumberRangeExpressionTest.java
index c0fab35eb53..5754f7ba6fe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchNumberRangeExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchNumberRangeExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchNumberRangeExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchNumberRangeExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchNumberRangeExpressionBuilder builder) {
         SearchNumberRangeExpression searchNumberRangeExpression = builder.buildUnchecked();
         Assertions.assertThat(searchNumberRangeExpression).isInstanceOf(SearchNumberRangeExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchNumberRangeExpression.builder()
+        return new Object[][] { new Object[] { "range", SearchNumberRangeExpression.builder()
                 .range(new com.commercetools.api.models.search.SearchNumberRangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchNumberRangeValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchNumberRangeValueTest.java
index 7eb22e4e6f4..84570433382 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchNumberRangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchNumberRangeValueTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchNumberRangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchNumberRangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchNumberRangeValueBuilder builder) {
         SearchNumberRangeValue searchNumberRangeValue = builder.buildUnchecked();
         Assertions.assertThat(searchNumberRangeValue).isInstanceOf(SearchNumberRangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchNumberRangeValue.builder().gte(0.8498576) },
-                new Object[] { SearchNumberRangeValue.builder().gt(0.15980393) },
-                new Object[] { SearchNumberRangeValue.builder().lte(0.26076245) },
-                new Object[] { SearchNumberRangeValue.builder().lt(0.5197181) } };
+        return new Object[][] { new Object[] { "gte", SearchNumberRangeValue.builder().gte(0.8498576) },
+                new Object[] { "gt", SearchNumberRangeValue.builder().gt(0.15980393) },
+                new Object[] { "lte", SearchNumberRangeValue.builder().lte(0.26076245) },
+                new Object[] { "lt", SearchNumberRangeValue.builder().lt(0.5197181) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchOrExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchOrExpressionTest.java
index 743edb42b7c..a169be33574 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchOrExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchOrExpressionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchOrExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchOrExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchOrExpressionBuilder builder) {
         SearchOrExpression searchOrExpression = builder.buildUnchecked();
         Assertions.assertThat(searchOrExpression).isInstanceOf(SearchOrExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchOrExpression.builder()
+        return new Object[][] { new Object[] { "or", SearchOrExpression.builder()
                 .or(Collections.singletonList(new com.commercetools.api.models.search.SearchQueryImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchPrefixExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchPrefixExpressionTest.java
index e9d625688d1..37c10300304 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchPrefixExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchPrefixExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchPrefixExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchPrefixExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchPrefixExpressionBuilder builder) {
         SearchPrefixExpression searchPrefixExpression = builder.buildUnchecked();
         Assertions.assertThat(searchPrefixExpression).isInstanceOf(SearchPrefixExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchPrefixExpression.builder()
+        return new Object[][] { new Object[] { "prefix", SearchPrefixExpression.builder()
                 .prefix(new com.commercetools.api.models.search.SearchAnyValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchQueryExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchQueryExpressionTest.java
index 78b2f40cdeb..5336bd37009 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchQueryExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchQueryExpressionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchQueryExpressionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchQueryExpressionValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchQueryExpressionValueTest.java
index 6ec0e7c07a2..2d4d910754b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchQueryExpressionValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchQueryExpressionValueTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchQueryExpressionValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchQueryExpressionValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchQueryExpressionValueBuilder builder) {
         SearchQueryExpressionValue searchQueryExpressionValue = builder.buildUnchecked();
         Assertions.assertThat(searchQueryExpressionValue).isInstanceOf(SearchQueryExpressionValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchQueryExpressionValue.builder().field("field") },
-                new Object[] { SearchQueryExpressionValue.builder().boost(0.8968434466791833) },
-                new Object[] { SearchQueryExpressionValue.builder()
+        return new Object[][] { new Object[] { "field", SearchQueryExpressionValue.builder().field("field") },
+                new Object[] { "boost", SearchQueryExpressionValue.builder().boost(0.8968434466791833) },
+                new Object[] { "fieldType", SearchQueryExpressionValue.builder()
                         .fieldType(com.commercetools.api.models.search.SearchFieldType.findEnum("boolean")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchQueryTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchQueryTest.java
index 8ae44b034b7..2602c5fd28b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchQueryTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchQueryTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchQueryTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchSortingTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchSortingTest.java
index 5ff68bc4df6..f34da0750fb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchSortingTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchSortingTest.java
@@ -1,38 +1,33 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchSortingTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchSortingBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchSortingBuilder builder) {
         SearchSorting searchSorting = builder.buildUnchecked();
         Assertions.assertThat(searchSorting).isInstanceOf(SearchSorting.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchSorting.builder().field("field") },
-                new Object[] { SearchSorting.builder().language("language") },
-                new Object[] { SearchSorting.builder()
-                        .order(com.commercetools.api.models.search.SearchSortOrder.findEnum("asc")) },
-                new Object[] { SearchSorting.builder()
-                        .mode(com.commercetools.api.models.search.SearchSortMode.findEnum("min")) },
-                new Object[] { SearchSorting.builder()
-                        .fieldType(com.commercetools.api.models.search.SearchFieldType.findEnum("boolean")) },
-                new Object[] { SearchSorting.builder()
+        return new Object[][] { new Object[] { "field", SearchSorting.builder().field("field") },
+                new Object[] { "language", SearchSorting.builder().language("language") },
+                new Object[] { "order",
+                        SearchSorting.builder()
+                                .order(com.commercetools.api.models.search.SearchSortOrder.findEnum("asc")) },
+                new Object[] { "mode",
+                        SearchSorting.builder()
+                                .mode(com.commercetools.api.models.search.SearchSortMode.findEnum("min")) },
+                new Object[] { "fieldType",
+                        SearchSorting.builder()
+                                .fieldType(com.commercetools.api.models.search.SearchFieldType.findEnum("boolean")) },
+                new Object[] { "filter", SearchSorting.builder()
                         .filter(new com.commercetools.api.models.search.SearchQueryExpressionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchTimeRangeExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchTimeRangeExpressionTest.java
index 055d21dc4d2..9cce6009b0e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchTimeRangeExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchTimeRangeExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchTimeRangeExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchTimeRangeExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchTimeRangeExpressionBuilder builder) {
         SearchTimeRangeExpression searchTimeRangeExpression = builder.buildUnchecked();
         Assertions.assertThat(searchTimeRangeExpression).isInstanceOf(SearchTimeRangeExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchTimeRangeExpression.builder()
+        return new Object[][] { new Object[] { "range", SearchTimeRangeExpression.builder()
                 .range(new com.commercetools.api.models.search.SearchTimeRangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchTimeRangeValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchTimeRangeValueTest.java
index cd7c8583f13..c91907974b6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchTimeRangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchTimeRangeValueTest.java
@@ -3,33 +3,25 @@
 
 import java.time.LocalTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchTimeRangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchTimeRangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchTimeRangeValueBuilder builder) {
         SearchTimeRangeValue searchTimeRangeValue = builder.buildUnchecked();
         Assertions.assertThat(searchTimeRangeValue).isInstanceOf(SearchTimeRangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchTimeRangeValue.builder().gte(LocalTime.parse("12:00")) },
-                new Object[] { SearchTimeRangeValue.builder().gt(LocalTime.parse("12:00")) },
-                new Object[] { SearchTimeRangeValue.builder().lte(LocalTime.parse("12:00")) },
-                new Object[] { SearchTimeRangeValue.builder().lt(LocalTime.parse("12:00")) } };
+        return new Object[][] { new Object[] { "gte", SearchTimeRangeValue.builder().gte(LocalTime.parse("12:00")) },
+                new Object[] { "gt", SearchTimeRangeValue.builder().gt(LocalTime.parse("12:00")) },
+                new Object[] { "lte", SearchTimeRangeValue.builder().lte(LocalTime.parse("12:00")) },
+                new Object[] { "lt", SearchTimeRangeValue.builder().lt(LocalTime.parse("12:00")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchWildCardExpressionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchWildCardExpressionTest.java
index b977cb74db1..2866a27309c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchWildCardExpressionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/search/SearchWildCardExpressionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.search;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchWildCardExpressionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchWildCardExpressionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchWildCardExpressionBuilder builder) {
         SearchWildCardExpression searchWildCardExpression = builder.buildUnchecked();
         Assertions.assertThat(searchWildCardExpression).isInstanceOf(SearchWildCardExpression.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchWildCardExpression.builder()
+        return new Object[][] { new Object[] { "wildcard", SearchWildCardExpression.builder()
                 .wildcard(new com.commercetools.api.models.search.SearchAnyValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/CartClassificationTierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/CartClassificationTierTest.java
index aa1077271a0..340888e8d1d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/CartClassificationTierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/CartClassificationTierTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartClassificationTierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartClassificationTierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartClassificationTierBuilder builder) {
         CartClassificationTier cartClassificationTier = builder.buildUnchecked();
         Assertions.assertThat(cartClassificationTier).isInstanceOf(CartClassificationTier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartClassificationTier.builder().value("value") },
-                new Object[] {
+        return new Object[][] { new Object[] { "value", CartClassificationTier.builder().value("value") },
+                new Object[] { "price",
                         CartClassificationTier.builder().price(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { CartClassificationTier.builder().isMatching(true) } };
+                new Object[] { "isMatching", CartClassificationTier.builder().isMatching(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/CartScoreTierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/CartScoreTierTest.java
index db52e6c4ed9..d0836eee6e5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/CartScoreTierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/CartScoreTierTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartScoreTierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartScoreTierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartScoreTierBuilder builder) {
         CartScoreTier cartScoreTier = builder.buildUnchecked();
         Assertions.assertThat(cartScoreTier).isInstanceOf(CartScoreTier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartScoreTier.builder().score(9) },
-                new Object[] { CartScoreTier.builder().price(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { CartScoreTier.builder()
-                        .priceFunction(new com.commercetools.api.models.shipping_method.PriceFunctionImpl()) },
-                new Object[] { CartScoreTier.builder().isMatching(true) } };
+        return new Object[][] { new Object[] { "score", CartScoreTier.builder().score(9) },
+                new Object[] { "price",
+                        CartScoreTier.builder().price(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "priceFunction",
+                        CartScoreTier.builder()
+                                .priceFunction(new com.commercetools.api.models.shipping_method.PriceFunctionImpl()) },
+                new Object[] { "isMatching", CartScoreTier.builder().isMatching(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/CartValueTierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/CartValueTierTest.java
index bc41d98a29a..8a3cc508b97 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/CartValueTierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/CartValueTierTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartValueTierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartValueTierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartValueTierBuilder builder) {
         CartValueTier cartValueTier = builder.buildUnchecked();
         Assertions.assertThat(cartValueTier).isInstanceOf(CartValueTier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartValueTier.builder().minimumCentAmount(3L) },
-                new Object[] { CartValueTier.builder().price(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { CartValueTier.builder().isMatching(true) } };
+        return new Object[][] { new Object[] { "minimumCentAmount", CartValueTier.builder().minimumCentAmount(3L) },
+                new Object[] { "price",
+                        CartValueTier.builder().price(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "isMatching", CartValueTier.builder().isMatching(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/PriceFunctionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/PriceFunctionTest.java
index ccdf559689b..7612ea0a4eb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/PriceFunctionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/PriceFunctionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PriceFunctionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PriceFunctionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PriceFunctionBuilder builder) {
         PriceFunction priceFunction = builder.buildUnchecked();
         Assertions.assertThat(priceFunction).isInstanceOf(PriceFunction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PriceFunction.builder().currencyCode("currencyCode") },
-                new Object[] { PriceFunction.builder().function("function") } };
+        return new Object[][] { new Object[] { "currencyCode", PriceFunction.builder().currencyCode("currencyCode") },
+                new Object[] { "function", PriceFunction.builder().function("function") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodAddShippingRateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodAddShippingRateActionTest.java
index c11c4cc320e..e32b467b255 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodAddShippingRateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodAddShippingRateActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodAddShippingRateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodAddShippingRateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodAddShippingRateActionBuilder builder) {
         ShippingMethodAddShippingRateAction shippingMethodAddShippingRateAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodAddShippingRateAction)
                 .isInstanceOf(ShippingMethodAddShippingRateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShippingMethodAddShippingRateAction.builder()
-                        .zone(new com.commercetools.api.models.zone.ZoneResourceIdentifierImpl()) },
-                new Object[] { ShippingMethodAddShippingRateAction.builder()
+                new Object[] { "zone",
+                        ShippingMethodAddShippingRateAction.builder()
+                                .zone(new com.commercetools.api.models.zone.ZoneResourceIdentifierImpl()) },
+                new Object[] { "shippingRate", ShippingMethodAddShippingRateAction.builder()
                         .shippingRate(new com.commercetools.api.models.shipping_method.ShippingRateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodAddZoneActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodAddZoneActionTest.java
index ba97d8599ea..6fc97e2e905 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodAddZoneActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodAddZoneActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodAddZoneActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodAddZoneActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodAddZoneActionBuilder builder) {
         ShippingMethodAddZoneAction shippingMethodAddZoneAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodAddZoneAction).isInstanceOf(ShippingMethodAddZoneAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodAddZoneAction.builder()
+        return new Object[][] { new Object[] { "zone", ShippingMethodAddZoneAction.builder()
                 .zone(new com.commercetools.api.models.zone.ZoneResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeActiveActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeActiveActionTest.java
index c81a7dd0bc4..03f4795264e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeActiveActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeActiveActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodChangeActiveActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodChangeActiveActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodChangeActiveActionBuilder builder) {
         ShippingMethodChangeActiveAction shippingMethodChangeActiveAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodChangeActiveAction).isInstanceOf(ShippingMethodChangeActiveAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodChangeActiveAction.builder().active(true) } };
+        return new Object[][] { new Object[] { "active", ShippingMethodChangeActiveAction.builder().active(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeIsDefaultActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeIsDefaultActionTest.java
index 804d44db06e..560294a623f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeIsDefaultActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeIsDefaultActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodChangeIsDefaultActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodChangeIsDefaultActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodChangeIsDefaultActionBuilder builder) {
         ShippingMethodChangeIsDefaultAction shippingMethodChangeIsDefaultAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodChangeIsDefaultAction)
                 .isInstanceOf(ShippingMethodChangeIsDefaultAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodChangeIsDefaultAction.builder().isDefault(true) } };
+        return new Object[][] {
+                new Object[] { "isDefault", ShippingMethodChangeIsDefaultAction.builder().isDefault(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeNameActionTest.java
index b873fb258ef..fd45b26198a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodChangeNameActionBuilder builder) {
         ShippingMethodChangeNameAction shippingMethodChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodChangeNameAction).isInstanceOf(ShippingMethodChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodChangeNameAction.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", ShippingMethodChangeNameAction.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeTaxCategoryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeTaxCategoryActionTest.java
index 2780dc62a3d..7022f46f6b5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeTaxCategoryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodChangeTaxCategoryActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodChangeTaxCategoryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodChangeTaxCategoryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodChangeTaxCategoryActionBuilder builder) {
         ShippingMethodChangeTaxCategoryAction shippingMethodChangeTaxCategoryAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodChangeTaxCategoryAction)
                 .isInstanceOf(ShippingMethodChangeTaxCategoryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodChangeTaxCategoryAction.builder()
+        return new Object[][] { new Object[] { "taxCategory", ShippingMethodChangeTaxCategoryAction.builder()
                 .taxCategory(new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodDraftTest.java
index e949c971728..106e8dec392 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodDraftTest.java
@@ -3,46 +3,41 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodDraftBuilder builder) {
         ShippingMethodDraft shippingMethodDraft = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodDraft).isInstanceOf(ShippingMethodDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodDraft.builder().key("key") },
-                new Object[] { ShippingMethodDraft.builder().name("name") },
-                new Object[] { ShippingMethodDraft.builder()
-                        .localizedName(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShippingMethodDraft.builder().description("description") },
-                new Object[] { ShippingMethodDraft.builder()
-                        .localizedDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShippingMethodDraft.builder()
+        return new Object[][] { new Object[] { "key", ShippingMethodDraft.builder().key("key") },
+                new Object[] { "name", ShippingMethodDraft.builder().name("name") },
+                new Object[] { "localizedName",
+                        ShippingMethodDraft.builder()
+                                .localizedName(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description", ShippingMethodDraft.builder().description("description") },
+                new Object[] { "localizedDescription",
+                        ShippingMethodDraft.builder()
+                                .localizedDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "taxCategory", ShippingMethodDraft.builder()
                         .taxCategory(
                             new com.commercetools.api.models.tax_category.TaxCategoryResourceIdentifierImpl()) },
-                new Object[] { ShippingMethodDraft.builder()
-                        .zoneRates(Collections
-                                .singletonList(new com.commercetools.api.models.shipping_method.ZoneRateDraftImpl())) },
-                new Object[] { ShippingMethodDraft.builder().active(true) },
-                new Object[] { ShippingMethodDraft.builder().isDefault(true) },
-                new Object[] { ShippingMethodDraft.builder().predicate("predicate") },
-                new Object[] { ShippingMethodDraft.builder()
+                new Object[] { "zoneRates",
+                        ShippingMethodDraft.builder()
+                                .zoneRates(Collections.singletonList(
+                                    new com.commercetools.api.models.shipping_method.ZoneRateDraftImpl())) },
+                new Object[] { "active", ShippingMethodDraft.builder().active(true) },
+                new Object[] { "isDefault", ShippingMethodDraft.builder().isDefault(true) },
+                new Object[] { "predicate", ShippingMethodDraft.builder().predicate("predicate") },
+                new Object[] { "custom", ShippingMethodDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodPagedQueryResponseTest.java
index 1ab25c2793b..a8a3db48baa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodPagedQueryResponseBuilder builder) {
         ShippingMethodPagedQueryResponse shippingMethodPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodPagedQueryResponse).isInstanceOf(ShippingMethodPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ShippingMethodPagedQueryResponse.builder().count(2L) },
-                new Object[] { ShippingMethodPagedQueryResponse.builder().total(1L) },
-                new Object[] { ShippingMethodPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ShippingMethodPagedQueryResponse.builder()
-                        .results(Collections.singletonList(
-                            new com.commercetools.api.models.shipping_method.ShippingMethodImpl())) } };
+        return new Object[][] { new Object[] { "limit", ShippingMethodPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "count", ShippingMethodPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ShippingMethodPagedQueryResponse.builder().total(1L) },
+                new Object[] { "offset", ShippingMethodPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "results",
+                        ShippingMethodPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.shipping_method.ShippingMethodImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodReferenceTest.java
index a8022ae9780..985e4b1c0af 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodReferenceBuilder builder) {
         ShippingMethodReference shippingMethodReference = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodReference).isInstanceOf(ShippingMethodReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShippingMethodReference.builder()
-                        .obj(new com.commercetools.api.models.shipping_method.ShippingMethodImpl()) },
-                new Object[] { ShippingMethodReference.builder().id("id") } };
+                new Object[] { "obj",
+                        ShippingMethodReference.builder()
+                                .obj(new com.commercetools.api.models.shipping_method.ShippingMethodImpl()) },
+                new Object[] { "id", ShippingMethodReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodRemoveShippingRateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodRemoveShippingRateActionTest.java
index bc949461e22..2b7530e8f61 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodRemoveShippingRateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodRemoveShippingRateActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodRemoveShippingRateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodRemoveShippingRateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodRemoveShippingRateActionBuilder builder) {
         ShippingMethodRemoveShippingRateAction shippingMethodRemoveShippingRateAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodRemoveShippingRateAction)
                 .isInstanceOf(ShippingMethodRemoveShippingRateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShippingMethodRemoveShippingRateAction.builder()
-                        .zone(new com.commercetools.api.models.zone.ZoneResourceIdentifierImpl()) },
-                new Object[] { ShippingMethodRemoveShippingRateAction.builder()
+                new Object[] { "zone",
+                        ShippingMethodRemoveShippingRateAction.builder()
+                                .zone(new com.commercetools.api.models.zone.ZoneResourceIdentifierImpl()) },
+                new Object[] { "shippingRate", ShippingMethodRemoveShippingRateAction.builder()
                         .shippingRate(new com.commercetools.api.models.shipping_method.ShippingRateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodRemoveZoneActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodRemoveZoneActionTest.java
index 1d0d6391526..336d54dc361 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodRemoveZoneActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodRemoveZoneActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodRemoveZoneActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodRemoveZoneActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodRemoveZoneActionBuilder builder) {
         ShippingMethodRemoveZoneAction shippingMethodRemoveZoneAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodRemoveZoneAction).isInstanceOf(ShippingMethodRemoveZoneAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodRemoveZoneAction.builder()
+        return new Object[][] { new Object[] { "zone", ShippingMethodRemoveZoneAction.builder()
                 .zone(new com.commercetools.api.models.zone.ZoneResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodResourceIdentifierTest.java
index fc65529bdbf..cf00bc995b0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodResourceIdentifierBuilder builder) {
         ShippingMethodResourceIdentifier shippingMethodResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodResourceIdentifier).isInstanceOf(ShippingMethodResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodResourceIdentifier.builder().id("id") },
-                new Object[] { ShippingMethodResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", ShippingMethodResourceIdentifier.builder().id("id") },
+                new Object[] { "key", ShippingMethodResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetCustomFieldActionTest.java
index 6230d13b8de..4f54ac127ad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetCustomFieldActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodSetCustomFieldActionBuilder builder) {
         ShippingMethodSetCustomFieldAction shippingMethodSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodSetCustomFieldAction)
                 .isInstanceOf(ShippingMethodSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodSetCustomFieldAction.builder().name("name") },
-                new Object[] { ShippingMethodSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", ShippingMethodSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ShippingMethodSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetCustomTypeActionTest.java
index d81a84731d1..f0c7e6f2d80 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodSetCustomTypeActionBuilder builder) {
         ShippingMethodSetCustomTypeAction shippingMethodSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodSetCustomTypeAction).isInstanceOf(ShippingMethodSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShippingMethodSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ShippingMethodSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        ShippingMethodSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ShippingMethodSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetDescriptionActionTest.java
index 682995d765e..2d2378cf04b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetDescriptionActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodSetDescriptionActionBuilder builder) {
         ShippingMethodSetDescriptionAction shippingMethodSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodSetDescriptionAction)
                 .isInstanceOf(ShippingMethodSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { ShippingMethodSetDescriptionAction.builder().description("description") } };
+        return new Object[][] { new Object[] { "description",
+                ShippingMethodSetDescriptionAction.builder().description("description") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetKeyActionTest.java
index 564e31a73be..0e6e0ca68ce 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodSetKeyActionBuilder builder) {
         ShippingMethodSetKeyAction shippingMethodSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodSetKeyAction).isInstanceOf(ShippingMethodSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ShippingMethodSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetLocalizedDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetLocalizedDescriptionActionTest.java
index fe58d491c78..5f8b642c494 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetLocalizedDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetLocalizedDescriptionActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodSetLocalizedDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodSetLocalizedDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodSetLocalizedDescriptionActionBuilder builder) {
         ShippingMethodSetLocalizedDescriptionAction shippingMethodSetLocalizedDescriptionAction = builder
                 .buildUnchecked();
         Assertions.assertThat(shippingMethodSetLocalizedDescriptionAction)
                 .isInstanceOf(ShippingMethodSetLocalizedDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodSetLocalizedDescriptionAction.builder()
-                .localizedDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
+        return new Object[][] {
+                new Object[] { "localizedDescription", ShippingMethodSetLocalizedDescriptionAction.builder()
+                        .localizedDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetLocalizedNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetLocalizedNameActionTest.java
index b38117b49b5..891b0e268dc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetLocalizedNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetLocalizedNameActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodSetLocalizedNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodSetLocalizedNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodSetLocalizedNameActionBuilder builder) {
         ShippingMethodSetLocalizedNameAction shippingMethodSetLocalizedNameAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodSetLocalizedNameAction)
                 .isInstanceOf(ShippingMethodSetLocalizedNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodSetLocalizedNameAction.builder()
+        return new Object[][] { new Object[] { "localizedName", ShippingMethodSetLocalizedNameAction.builder()
                 .localizedName(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetPredicateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetPredicateActionTest.java
index 76d69662d93..7cc96762a35 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetPredicateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodSetPredicateActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.shipping_method;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodSetPredicateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodSetPredicateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodSetPredicateActionBuilder builder) {
         ShippingMethodSetPredicateAction shippingMethodSetPredicateAction = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodSetPredicateAction).isInstanceOf(ShippingMethodSetPredicateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodSetPredicateAction.builder().predicate("predicate") } };
+        return new Object[][] {
+                new Object[] { "predicate", ShippingMethodSetPredicateAction.builder().predicate("predicate") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodTest.java
index 142bdbe7760..d3ebbf92516 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodTest.java
@@ -4,52 +4,50 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodBuilder builder) {
         ShippingMethod shippingMethod = builder.buildUnchecked();
         Assertions.assertThat(shippingMethod).isInstanceOf(ShippingMethod.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethod.builder().id("id") },
-                new Object[] { ShippingMethod.builder().version(2L) },
-                new Object[] { ShippingMethod.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ShippingMethod.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ShippingMethod.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", ShippingMethod.builder().id("id") },
+                new Object[] { "version", ShippingMethod.builder().version(2L) },
+                new Object[] { "createdAt",
+                        ShippingMethod.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        ShippingMethod.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        ShippingMethod.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         ShippingMethod.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { ShippingMethod.builder().key("key") },
-                new Object[] { ShippingMethod.builder().name("name") },
-                new Object[] { ShippingMethod.builder()
-                        .localizedName(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShippingMethod.builder().description("description") },
-                new Object[] { ShippingMethod.builder()
-                        .localizedDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShippingMethod.builder()
+                new Object[] { "key", ShippingMethod.builder().key("key") },
+                new Object[] { "name", ShippingMethod.builder().name("name") },
+                new Object[] { "localizedName",
+                        ShippingMethod.builder()
+                                .localizedName(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description", ShippingMethod.builder().description("description") },
+                new Object[] { "localizedDescription",
+                        ShippingMethod.builder()
+                                .localizedDescription(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "taxCategory", ShippingMethod.builder()
                         .taxCategory(new com.commercetools.api.models.tax_category.TaxCategoryReferenceImpl()) },
-                new Object[] { ShippingMethod.builder()
-                        .zoneRates(Collections
-                                .singletonList(new com.commercetools.api.models.shipping_method.ZoneRateImpl())) },
-                new Object[] { ShippingMethod.builder().active(true) },
-                new Object[] { ShippingMethod.builder().isDefault(true) },
-                new Object[] { ShippingMethod.builder().predicate("predicate") }, new Object[] {
+                new Object[] { "zoneRates",
+                        ShippingMethod.builder()
+                                .zoneRates(Collections.singletonList(
+                                    new com.commercetools.api.models.shipping_method.ZoneRateImpl())) },
+                new Object[] { "active", ShippingMethod.builder().active(true) },
+                new Object[] { "isDefault", ShippingMethod.builder().isDefault(true) },
+                new Object[] { "predicate", ShippingMethod.builder().predicate("predicate") }, new Object[] { "custom",
                         ShippingMethod.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodUpdateTest.java
index 0f34e46cd26..312abe86e64 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingMethodUpdateTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodUpdateBuilder builder) {
         ShippingMethodUpdate shippingMethodUpdate = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodUpdate).isInstanceOf(ShippingMethodUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodUpdate.builder().version(2L) },
-                new Object[] { ShippingMethodUpdate.builder()
+        return new Object[][] { new Object[] { "version", ShippingMethodUpdate.builder().version(2L) },
+                new Object[] { "actions", ShippingMethodUpdate.builder()
                         .actions(Collections.singletonList(
                             new com.commercetools.api.models.shipping_method.ShippingMethodUpdateActionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingRateDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingRateDraftTest.java
index ce51761b3c9..6e9bdba5b17 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingRateDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingRateDraftTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingRateDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingRateDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingRateDraftBuilder builder) {
         ShippingRateDraft shippingRateDraft = builder.buildUnchecked();
         Assertions.assertThat(shippingRateDraft).isInstanceOf(ShippingRateDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShippingRateDraft.builder().price(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] {
+                new Object[] { "price",
+                        ShippingRateDraft.builder().price(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "freeAbove",
                         ShippingRateDraft.builder().freeAbove(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { ShippingRateDraft.builder()
-                        .tiers(Collections.singletonList(
-                            new com.commercetools.api.models.shipping_method.ShippingRatePriceTierImpl())) } };
+                new Object[] { "tiers",
+                        ShippingRateDraft.builder()
+                                .tiers(Collections.singletonList(
+                                    new com.commercetools.api.models.shipping_method.ShippingRatePriceTierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingRateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingRateTest.java
index cadca648f25..cb170ab5ca5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingRateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ShippingRateTest.java
@@ -3,38 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingRateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingRateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingRateBuilder builder) {
         ShippingRate shippingRate = builder.buildUnchecked();
         Assertions.assertThat(shippingRate).isInstanceOf(ShippingRate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShippingRate.builder()
-                        .price(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { ShippingRate.builder()
-                        .freeAbove(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
-                new Object[] { ShippingRate.builder().isMatching(true) },
-                new Object[] { ShippingRate.builder()
-                        .tiers(Collections.singletonList(
-                            new com.commercetools.api.models.shipping_method.ShippingRatePriceTierImpl())) } };
+                new Object[] { "price",
+                        ShippingRate.builder()
+                                .price(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "freeAbove",
+                        ShippingRate.builder()
+                                .freeAbove(new com.commercetools.api.models.common.CentPrecisionMoneyImpl()) },
+                new Object[] { "isMatching", ShippingRate.builder().isMatching(true) },
+                new Object[] { "tiers",
+                        ShippingRate.builder()
+                                .tiers(Collections.singletonList(
+                                    new com.commercetools.api.models.shipping_method.ShippingRatePriceTierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ZoneRateDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ZoneRateDraftTest.java
index 9e54860629f..b6127c72589 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ZoneRateDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ZoneRateDraftTest.java
@@ -3,35 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZoneRateDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZoneRateDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZoneRateDraftBuilder builder) {
         ZoneRateDraft zoneRateDraft = builder.buildUnchecked();
         Assertions.assertThat(zoneRateDraft).isInstanceOf(ZoneRateDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ZoneRateDraft.builder()
-                        .zone(new com.commercetools.api.models.zone.ZoneResourceIdentifierImpl()) },
-                new Object[] { ZoneRateDraft.builder()
-                        .shippingRates(Collections.singletonList(
-                            new com.commercetools.api.models.shipping_method.ShippingRateDraftImpl())) } };
+                new Object[] { "zone",
+                        ZoneRateDraft.builder()
+                                .zone(new com.commercetools.api.models.zone.ZoneResourceIdentifierImpl()) },
+                new Object[] { "shippingRates",
+                        ZoneRateDraft.builder()
+                                .shippingRates(Collections.singletonList(
+                                    new com.commercetools.api.models.shipping_method.ShippingRateDraftImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ZoneRateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ZoneRateTest.java
index 21b9e0b58ea..b9621e77a1d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ZoneRateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shipping_method/ZoneRateTest.java
@@ -3,34 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZoneRateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZoneRateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZoneRateBuilder builder) {
         ZoneRate zoneRate = builder.buildUnchecked();
         Assertions.assertThat(zoneRate).isInstanceOf(ZoneRate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ZoneRate.builder().zone(new com.commercetools.api.models.zone.ZoneReferenceImpl()) },
-                new Object[] { ZoneRate.builder()
-                        .shippingRates(Collections.singletonList(
-                            new com.commercetools.api.models.shipping_method.ShippingRateImpl())) } };
+                new Object[] { "zone",
+                        ZoneRate.builder().zone(new com.commercetools.api.models.zone.ZoneReferenceImpl()) },
+                new Object[] { "shippingRates",
+                        ZoneRate.builder()
+                                .shippingRates(Collections.singletonList(
+                                    new com.commercetools.api.models.shipping_method.ShippingRateImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListAddLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListAddLineItemActionTest.java
index b1a098b795f..264a783dc75 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListAddLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListAddLineItemActionTest.java
@@ -3,37 +3,29 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListAddLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListAddLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListAddLineItemActionBuilder builder) {
         ShoppingListAddLineItemAction shoppingListAddLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListAddLineItemAction).isInstanceOf(ShoppingListAddLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListAddLineItemAction.builder().key("key") },
-                new Object[] { ShoppingListAddLineItemAction.builder().sku("sku") },
-                new Object[] { ShoppingListAddLineItemAction.builder().productId("productId") },
-                new Object[] { ShoppingListAddLineItemAction.builder().variantId(5L) },
-                new Object[] { ShoppingListAddLineItemAction.builder().quantity(8L) },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", ShoppingListAddLineItemAction.builder().key("key") },
+                new Object[] { "sku", ShoppingListAddLineItemAction.builder().sku("sku") },
+                new Object[] { "productId", ShoppingListAddLineItemAction.builder().productId("productId") },
+                new Object[] { "variantId", ShoppingListAddLineItemAction.builder().variantId(5L) },
+                new Object[] { "quantity", ShoppingListAddLineItemAction.builder().quantity(8L) },
+                new Object[] { "addedAt",
                         ShoppingListAddLineItemAction.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ShoppingListAddLineItemAction.builder()
+                new Object[] { "custom", ShoppingListAddLineItemAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListAddTextLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListAddTextLineItemActionTest.java
index ba0d8b5334c..bc9feeb936a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListAddTextLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListAddTextLineItemActionTest.java
@@ -3,39 +3,33 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListAddTextLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListAddTextLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListAddTextLineItemActionBuilder builder) {
         ShoppingListAddTextLineItemAction shoppingListAddTextLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListAddTextLineItemAction).isInstanceOf(ShoppingListAddTextLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShoppingListAddTextLineItemAction.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShoppingListAddTextLineItemAction.builder().key("key") },
-                new Object[] { ShoppingListAddTextLineItemAction.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShoppingListAddTextLineItemAction.builder().quantity(8L) },
-                new Object[] {
+                new Object[] { "name",
+                        ShoppingListAddTextLineItemAction.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "key", ShoppingListAddTextLineItemAction.builder().key("key") },
+                new Object[] { "description",
+                        ShoppingListAddTextLineItemAction.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "quantity", ShoppingListAddTextLineItemAction.builder().quantity(8L) },
+                new Object[] { "addedAt",
                         ShoppingListAddTextLineItemAction.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ShoppingListAddTextLineItemAction.builder()
+                new Object[] { "custom", ShoppingListAddTextLineItemAction.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeLineItemQuantityActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeLineItemQuantityActionTest.java
index 13c0fe61aa2..9aa44e09995 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeLineItemQuantityActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeLineItemQuantityActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListChangeLineItemQuantityActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListChangeLineItemQuantityActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListChangeLineItemQuantityActionBuilder builder) {
         ShoppingListChangeLineItemQuantityAction shoppingListChangeLineItemQuantityAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListChangeLineItemQuantityAction)
                 .isInstanceOf(ShoppingListChangeLineItemQuantityAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShoppingListChangeLineItemQuantityAction.builder().lineItemId("lineItemId") },
-                new Object[] { ShoppingListChangeLineItemQuantityAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { ShoppingListChangeLineItemQuantityAction.builder().quantity(8L) } };
+                new Object[] { "lineItemId",
+                        ShoppingListChangeLineItemQuantityAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        ShoppingListChangeLineItemQuantityAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "quantity", ShoppingListChangeLineItemQuantityAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeLineItemsOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeLineItemsOrderActionTest.java
index 237def0bc2c..831c52f088e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeLineItemsOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeLineItemsOrderActionTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListChangeLineItemsOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListChangeLineItemsOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListChangeLineItemsOrderActionBuilder builder) {
         ShoppingListChangeLineItemsOrderAction shoppingListChangeLineItemsOrderAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListChangeLineItemsOrderAction)
                 .isInstanceOf(ShoppingListChangeLineItemsOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListChangeLineItemsOrderAction.builder()
+        return new Object[][] { new Object[] { "lineItemOrder", ShoppingListChangeLineItemsOrderAction.builder()
                 .lineItemOrder(Collections.singletonList("lineItemOrder")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeNameActionTest.java
index cb526618684..675423be491 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListChangeNameActionBuilder builder) {
         ShoppingListChangeNameAction shoppingListChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListChangeNameAction).isInstanceOf(ShoppingListChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListChangeNameAction.builder()
+        return new Object[][] { new Object[] { "name", ShoppingListChangeNameAction.builder()
                 .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeTextLineItemNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeTextLineItemNameActionTest.java
index d7a0b04daed..0e769b019ed 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeTextLineItemNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeTextLineItemNameActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListChangeTextLineItemNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListChangeTextLineItemNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListChangeTextLineItemNameActionBuilder builder) {
         ShoppingListChangeTextLineItemNameAction shoppingListChangeTextLineItemNameAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListChangeTextLineItemNameAction)
                 .isInstanceOf(ShoppingListChangeTextLineItemNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShoppingListChangeTextLineItemNameAction.builder().textLineItemId("textLineItemId") },
-                new Object[] { ShoppingListChangeTextLineItemNameAction.builder().textLineItemKey("textLineItemKey") },
-                new Object[] { ShoppingListChangeTextLineItemNameAction.builder()
+                new Object[] { "textLineItemId",
+                        ShoppingListChangeTextLineItemNameAction.builder().textLineItemId("textLineItemId") },
+                new Object[] { "textLineItemKey",
+                        ShoppingListChangeTextLineItemNameAction.builder().textLineItemKey("textLineItemKey") },
+                new Object[] { "name", ShoppingListChangeTextLineItemNameAction.builder()
                         .name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeTextLineItemQuantityActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeTextLineItemQuantityActionTest.java
index e9ccb1596b2..538575cbb7c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeTextLineItemQuantityActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeTextLineItemQuantityActionTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListChangeTextLineItemQuantityActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListChangeTextLineItemQuantityActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListChangeTextLineItemQuantityActionBuilder builder) {
         ShoppingListChangeTextLineItemQuantityAction shoppingListChangeTextLineItemQuantityAction = builder
                 .buildUnchecked();
         Assertions.assertThat(shoppingListChangeTextLineItemQuantityAction)
                 .isInstanceOf(ShoppingListChangeTextLineItemQuantityAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "textLineItemId",
                         ShoppingListChangeTextLineItemQuantityAction.builder().textLineItemId("textLineItemId") },
-                new Object[] {
+                new Object[] { "textLineItemKey",
                         ShoppingListChangeTextLineItemQuantityAction.builder().textLineItemKey("textLineItemKey") },
-                new Object[] { ShoppingListChangeTextLineItemQuantityAction.builder().quantity(8L) } };
+                new Object[] { "quantity", ShoppingListChangeTextLineItemQuantityAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeTextLineItemsOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeTextLineItemsOrderActionTest.java
index e6a86b919e8..d5d67c7f908 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeTextLineItemsOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListChangeTextLineItemsOrderActionTest.java
@@ -3,32 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListChangeTextLineItemsOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListChangeTextLineItemsOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListChangeTextLineItemsOrderActionBuilder builder) {
         ShoppingListChangeTextLineItemsOrderAction shoppingListChangeTextLineItemsOrderAction = builder
                 .buildUnchecked();
         Assertions.assertThat(shoppingListChangeTextLineItemsOrderAction)
                 .isInstanceOf(ShoppingListChangeTextLineItemsOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListChangeTextLineItemsOrderAction.builder()
+        return new Object[][] { new Object[] { "textLineItemOrder", ShoppingListChangeTextLineItemsOrderAction.builder()
                 .textLineItemOrder(Collections.singletonList("textLineItemOrder")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListDraftTest.java
index 8b049e5b231..4588d1c444c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListDraftTest.java
@@ -3,53 +3,53 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListDraftBuilder builder) {
         ShoppingListDraft shoppingListDraft = builder.buildUnchecked();
         Assertions.assertThat(shoppingListDraft).isInstanceOf(ShoppingListDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShoppingListDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShoppingListDraft.builder()
-                        .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShoppingListDraft.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) },
-                new Object[] { ShoppingListDraft.builder().key("key") },
-                new Object[] { ShoppingListDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShoppingListDraft.builder().anonymousId("anonymousId") },
-                new Object[] { ShoppingListDraft.builder().deleteDaysAfterLastModification(3L) },
-                new Object[] { ShoppingListDraft.builder()
-                        .lineItems(Collections.singletonList(
-                            new com.commercetools.api.models.shopping_list.ShoppingListLineItemDraftImpl())) },
-                new Object[] { ShoppingListDraft.builder()
-                        .textLineItems(Collections.singletonList(
-                            new com.commercetools.api.models.shopping_list.TextLineItemDraftImpl())) },
-                new Object[] { ShoppingListDraft.builder()
-                        .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) },
-                new Object[] { ShoppingListDraft.builder()
+                new Object[] { "name",
+                        ShoppingListDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "slug",
+                        ShoppingListDraft.builder()
+                                .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "customer",
+                        ShoppingListDraft.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) },
+                new Object[] { "key", ShoppingListDraft.builder().key("key") },
+                new Object[] { "description",
+                        ShoppingListDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "anonymousId", ShoppingListDraft.builder().anonymousId("anonymousId") },
+                new Object[] { "deleteDaysAfterLastModification",
+                        ShoppingListDraft.builder().deleteDaysAfterLastModification(3L) },
+                new Object[] { "lineItems",
+                        ShoppingListDraft.builder()
+                                .lineItems(Collections.singletonList(
+                                    new com.commercetools.api.models.shopping_list.ShoppingListLineItemDraftImpl())) },
+                new Object[] { "textLineItems",
+                        ShoppingListDraft.builder()
+                                .textLineItems(Collections.singletonList(
+                                    new com.commercetools.api.models.shopping_list.TextLineItemDraftImpl())) },
+                new Object[] { "store",
+                        ShoppingListDraft.builder()
+                                .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) },
+                new Object[] { "businessUnit", ShoppingListDraft.builder()
                         .businessUnit(
                             new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) },
-                new Object[] { ShoppingListDraft.builder()
+                new Object[] { "custom", ShoppingListDraft.builder()
                         .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListLineItemDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListLineItemDraftTest.java
index 0f49c25744b..7a83c3038f3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListLineItemDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListLineItemDraftTest.java
@@ -3,37 +3,31 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListLineItemDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListLineItemDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListLineItemDraftBuilder builder) {
         ShoppingListLineItemDraft shoppingListLineItemDraft = builder.buildUnchecked();
         Assertions.assertThat(shoppingListLineItemDraft).isInstanceOf(ShoppingListLineItemDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListLineItemDraft.builder().key("key") },
-                new Object[] { ShoppingListLineItemDraft.builder().productId("productId") },
-                new Object[] { ShoppingListLineItemDraft.builder().variantId(5L) },
-                new Object[] { ShoppingListLineItemDraft.builder().sku("sku") },
-                new Object[] { ShoppingListLineItemDraft.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ShoppingListLineItemDraft.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { ShoppingListLineItemDraft.builder().quantity(8L) } };
+        return new Object[][] { new Object[] { "key", ShoppingListLineItemDraft.builder().key("key") },
+                new Object[] { "productId", ShoppingListLineItemDraft.builder().productId("productId") },
+                new Object[] { "variantId", ShoppingListLineItemDraft.builder().variantId(5L) },
+                new Object[] { "sku", ShoppingListLineItemDraft.builder().sku("sku") },
+                new Object[] { "addedAt",
+                        ShoppingListLineItemDraft.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "custom",
+                        ShoppingListLineItemDraft.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "quantity", ShoppingListLineItemDraft.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListLineItemTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListLineItemTest.java
index d43b87a72e5..51d0940fc67 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListLineItemTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListLineItemTest.java
@@ -3,47 +3,44 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListLineItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListLineItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListLineItemBuilder builder) {
         ShoppingListLineItem shoppingListLineItem = builder.buildUnchecked();
         Assertions.assertThat(shoppingListLineItem).isInstanceOf(ShoppingListLineItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShoppingListLineItem.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ShoppingListLineItem.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { ShoppingListLineItem.builder().deactivatedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ShoppingListLineItem.builder().id("id") },
-                new Object[] { ShoppingListLineItem.builder().key("key") },
-                new Object[] { ShoppingListLineItem.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShoppingListLineItem.builder().productId("productId") },
-                new Object[] { ShoppingListLineItem.builder()
+                new Object[] { "addedAt",
+                        ShoppingListLineItem.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "custom",
+                        ShoppingListLineItem.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "deactivatedAt",
+                        ShoppingListLineItem.builder().deactivatedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "id", ShoppingListLineItem.builder().id("id") },
+                new Object[] { "key", ShoppingListLineItem.builder().key("key") },
+                new Object[] { "name",
+                        ShoppingListLineItem.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "productId", ShoppingListLineItem.builder().productId("productId") },
+                new Object[] { "productType", ShoppingListLineItem.builder()
                         .productType(new com.commercetools.api.models.product_type.ProductTypeReferenceImpl()) },
-                new Object[] { ShoppingListLineItem.builder().published(true) },
-                new Object[] { ShoppingListLineItem.builder().quantity(8L) },
-                new Object[] { ShoppingListLineItem.builder().variantId(5L) },
-                new Object[] { ShoppingListLineItem.builder()
-                        .variant(new com.commercetools.api.models.product.ProductVariantImpl()) },
-                new Object[] { ShoppingListLineItem.builder()
+                new Object[] { "published", ShoppingListLineItem.builder().published(true) },
+                new Object[] { "quantity", ShoppingListLineItem.builder().quantity(8L) },
+                new Object[] { "variantId", ShoppingListLineItem.builder().variantId(5L) },
+                new Object[] { "variant",
+                        ShoppingListLineItem.builder()
+                                .variant(new com.commercetools.api.models.product.ProductVariantImpl()) },
+                new Object[] { "productSlug", ShoppingListLineItem.builder()
                         .productSlug(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListPagedQueryResponseTest.java
index 9024ae44aec..d76fabaecdf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListPagedQueryResponseBuilder builder) {
         ShoppingListPagedQueryResponse shoppingListPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(shoppingListPagedQueryResponse).isInstanceOf(ShoppingListPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListPagedQueryResponse.builder().limit(7L) },
-                new Object[] { ShoppingListPagedQueryResponse.builder().count(2L) },
-                new Object[] { ShoppingListPagedQueryResponse.builder().total(1L) },
-                new Object[] { ShoppingListPagedQueryResponse.builder().offset(3L) },
-                new Object[] { ShoppingListPagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.shopping_list.ShoppingListImpl())) } };
+        return new Object[][] { new Object[] { "limit", ShoppingListPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "count", ShoppingListPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ShoppingListPagedQueryResponse.builder().total(1L) },
+                new Object[] { "offset", ShoppingListPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "results",
+                        ShoppingListPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.shopping_list.ShoppingListImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListReferenceTest.java
index d1dd7da7ced..8b4f1a11792 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListReferenceBuilder builder) {
         ShoppingListReference shoppingListReference = builder.buildUnchecked();
         Assertions.assertThat(shoppingListReference).isInstanceOf(ShoppingListReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShoppingListReference.builder()
-                        .obj(new com.commercetools.api.models.shopping_list.ShoppingListImpl()) },
-                new Object[] { ShoppingListReference.builder().id("id") } };
+                new Object[] { "obj",
+                        ShoppingListReference.builder()
+                                .obj(new com.commercetools.api.models.shopping_list.ShoppingListImpl()) },
+                new Object[] { "id", ShoppingListReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListRemoveLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListRemoveLineItemActionTest.java
index 0745099b210..af0029d989b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListRemoveLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListRemoveLineItemActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListRemoveLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListRemoveLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListRemoveLineItemActionBuilder builder) {
         ShoppingListRemoveLineItemAction shoppingListRemoveLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListRemoveLineItemAction).isInstanceOf(ShoppingListRemoveLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListRemoveLineItemAction.builder().lineItemId("lineItemId") },
-                new Object[] { ShoppingListRemoveLineItemAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { ShoppingListRemoveLineItemAction.builder().quantity(8L) } };
+        return new Object[][] {
+                new Object[] { "lineItemId", ShoppingListRemoveLineItemAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey", ShoppingListRemoveLineItemAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "quantity", ShoppingListRemoveLineItemAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListRemoveTextLineItemActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListRemoveTextLineItemActionTest.java
index 490789a0fc4..fa98250c194 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListRemoveTextLineItemActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListRemoveTextLineItemActionTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListRemoveTextLineItemActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListRemoveTextLineItemActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListRemoveTextLineItemActionBuilder builder) {
         ShoppingListRemoveTextLineItemAction shoppingListRemoveTextLineItemAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListRemoveTextLineItemAction)
                 .isInstanceOf(ShoppingListRemoveTextLineItemAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShoppingListRemoveTextLineItemAction.builder().textLineItemId("textLineItemId") },
-                new Object[] { ShoppingListRemoveTextLineItemAction.builder().textLineItemKey("textLineItemKey") },
-                new Object[] { ShoppingListRemoveTextLineItemAction.builder().quantity(8L) } };
+                new Object[] { "textLineItemId",
+                        ShoppingListRemoveTextLineItemAction.builder().textLineItemId("textLineItemId") },
+                new Object[] { "textLineItemKey",
+                        ShoppingListRemoveTextLineItemAction.builder().textLineItemKey("textLineItemKey") },
+                new Object[] { "quantity", ShoppingListRemoveTextLineItemAction.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListResourceIdentifierTest.java
index 5418177a7aa..a6c7fcfb4ce 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListResourceIdentifierBuilder builder) {
         ShoppingListResourceIdentifier shoppingListResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(shoppingListResourceIdentifier).isInstanceOf(ShoppingListResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListResourceIdentifier.builder().id("id") },
-                new Object[] { ShoppingListResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", ShoppingListResourceIdentifier.builder().id("id") },
+                new Object[] { "key", ShoppingListResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetAnonymousIdActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetAnonymousIdActionTest.java
index d339add8270..28c853b6cad 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetAnonymousIdActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetAnonymousIdActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetAnonymousIdActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetAnonymousIdActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetAnonymousIdActionBuilder builder) {
         ShoppingListSetAnonymousIdAction shoppingListSetAnonymousIdAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListSetAnonymousIdAction).isInstanceOf(ShoppingListSetAnonymousIdAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShoppingListSetAnonymousIdAction.builder().anonymousId("anonymousId") } };
+                new Object[] { "anonymousId", ShoppingListSetAnonymousIdAction.builder().anonymousId("anonymousId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetBusinessUnitActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetBusinessUnitActionTest.java
index 870fd2673e2..ca89ac55df3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetBusinessUnitActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetBusinessUnitActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetBusinessUnitActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetBusinessUnitActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetBusinessUnitActionBuilder builder) {
         ShoppingListSetBusinessUnitAction shoppingListSetBusinessUnitAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListSetBusinessUnitAction).isInstanceOf(ShoppingListSetBusinessUnitAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListSetBusinessUnitAction.builder()
+        return new Object[][] { new Object[] { "businessUnit", ShoppingListSetBusinessUnitAction.builder()
                 .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetCustomFieldActionTest.java
index 651fe32cc22..89534ed852f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetCustomFieldActionBuilder builder) {
         ShoppingListSetCustomFieldAction shoppingListSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListSetCustomFieldAction).isInstanceOf(ShoppingListSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListSetCustomFieldAction.builder().name("name") },
-                new Object[] { ShoppingListSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", ShoppingListSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ShoppingListSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetCustomTypeActionTest.java
index 76b1b1365fe..a8d0ca71106 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetCustomTypeActionBuilder builder) {
         ShoppingListSetCustomTypeAction shoppingListSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListSetCustomTypeAction).isInstanceOf(ShoppingListSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShoppingListSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ShoppingListSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        ShoppingListSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ShoppingListSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetCustomerActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetCustomerActionTest.java
index 56d5b6ce243..76580ca9300 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetCustomerActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetCustomerActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetCustomerActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetCustomerActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetCustomerActionBuilder builder) {
         ShoppingListSetCustomerAction shoppingListSetCustomerAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListSetCustomerAction).isInstanceOf(ShoppingListSetCustomerAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListSetCustomerAction.builder()
+        return new Object[][] { new Object[] { "customer", ShoppingListSetCustomerAction.builder()
                 .customer(new com.commercetools.api.models.customer.CustomerResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetDeleteDaysAfterLastModificationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetDeleteDaysAfterLastModificationActionTest.java
index cf0189f8afc..f28b1c62508 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetDeleteDaysAfterLastModificationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetDeleteDaysAfterLastModificationActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetDeleteDaysAfterLastModificationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetDeleteDaysAfterLastModificationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetDeleteDaysAfterLastModificationActionBuilder builder) {
         ShoppingListSetDeleteDaysAfterLastModificationAction shoppingListSetDeleteDaysAfterLastModificationAction = builder
                 .buildUnchecked();
         Assertions.assertThat(shoppingListSetDeleteDaysAfterLastModificationAction)
                 .isInstanceOf(ShoppingListSetDeleteDaysAfterLastModificationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "deleteDaysAfterLastModification",
                 ShoppingListSetDeleteDaysAfterLastModificationAction.builder().deleteDaysAfterLastModification(3L) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetDescriptionActionTest.java
index 6832c79509c..0f5065dda01 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetDescriptionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetDescriptionActionBuilder builder) {
         ShoppingListSetDescriptionAction shoppingListSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListSetDescriptionAction).isInstanceOf(ShoppingListSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListSetDescriptionAction.builder()
+        return new Object[][] { new Object[] { "description", ShoppingListSetDescriptionAction.builder()
                 .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetKeyActionTest.java
index 524e3ec98f2..86c00040f9a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetKeyActionBuilder builder) {
         ShoppingListSetKeyAction shoppingListSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListSetKeyAction).isInstanceOf(ShoppingListSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ShoppingListSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetLineItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetLineItemCustomFieldActionTest.java
index 4031530b8de..fda46d47bef 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetLineItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetLineItemCustomFieldActionTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetLineItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetLineItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetLineItemCustomFieldActionBuilder builder) {
         ShoppingListSetLineItemCustomFieldAction shoppingListSetLineItemCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListSetLineItemCustomFieldAction)
                 .isInstanceOf(ShoppingListSetLineItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShoppingListSetLineItemCustomFieldAction.builder().lineItemId("lineItemId") },
-                new Object[] { ShoppingListSetLineItemCustomFieldAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { ShoppingListSetLineItemCustomFieldAction.builder().name("name") },
-                new Object[] { ShoppingListSetLineItemCustomFieldAction.builder().value("value") } };
+                new Object[] { "lineItemId",
+                        ShoppingListSetLineItemCustomFieldAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        ShoppingListSetLineItemCustomFieldAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "name", ShoppingListSetLineItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ShoppingListSetLineItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetLineItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetLineItemCustomTypeActionTest.java
index deb11dd8a0f..95800b302aa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetLineItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetLineItemCustomTypeActionTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetLineItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetLineItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetLineItemCustomTypeActionBuilder builder) {
         ShoppingListSetLineItemCustomTypeAction shoppingListSetLineItemCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListSetLineItemCustomTypeAction)
                 .isInstanceOf(ShoppingListSetLineItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShoppingListSetLineItemCustomTypeAction.builder().lineItemId("lineItemId") },
-                new Object[] { ShoppingListSetLineItemCustomTypeAction.builder().lineItemKey("lineItemKey") },
-                new Object[] { ShoppingListSetLineItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ShoppingListSetLineItemCustomTypeAction.builder()
+                new Object[] { "lineItemId",
+                        ShoppingListSetLineItemCustomTypeAction.builder().lineItemId("lineItemId") },
+                new Object[] { "lineItemKey",
+                        ShoppingListSetLineItemCustomTypeAction.builder().lineItemKey("lineItemKey") },
+                new Object[] { "type",
+                        ShoppingListSetLineItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ShoppingListSetLineItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetSlugActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetSlugActionTest.java
index 8de983903d5..af0ef6c00ca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetSlugActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetSlugActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetSlugActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetSlugActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetSlugActionBuilder builder) {
         ShoppingListSetSlugAction shoppingListSetSlugAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListSetSlugAction).isInstanceOf(ShoppingListSetSlugAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListSetSlugAction.builder()
+        return new Object[][] { new Object[] { "slug", ShoppingListSetSlugAction.builder()
                 .slug(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetStoreActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetStoreActionTest.java
index 5284dd50c3b..6c364f78915 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetStoreActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetStoreActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetStoreActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetStoreActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetStoreActionBuilder builder) {
         ShoppingListSetStoreAction shoppingListSetStoreAction = builder.buildUnchecked();
         Assertions.assertThat(shoppingListSetStoreAction).isInstanceOf(ShoppingListSetStoreAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListSetStoreAction.builder()
+        return new Object[][] { new Object[] { "store", ShoppingListSetStoreAction.builder()
                 .store(new com.commercetools.api.models.store.StoreResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetTextLineItemCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetTextLineItemCustomFieldActionTest.java
index 0e4bccad168..6c8a6f4826e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetTextLineItemCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetTextLineItemCustomFieldActionTest.java
@@ -1,38 +1,30 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetTextLineItemCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetTextLineItemCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetTextLineItemCustomFieldActionBuilder builder) {
         ShoppingListSetTextLineItemCustomFieldAction shoppingListSetTextLineItemCustomFieldAction = builder
                 .buildUnchecked();
         Assertions.assertThat(shoppingListSetTextLineItemCustomFieldAction)
                 .isInstanceOf(ShoppingListSetTextLineItemCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "textLineItemId",
                         ShoppingListSetTextLineItemCustomFieldAction.builder().textLineItemId("textLineItemId") },
-                new Object[] {
+                new Object[] { "textLineItemKey",
                         ShoppingListSetTextLineItemCustomFieldAction.builder().textLineItemKey("textLineItemKey") },
-                new Object[] { ShoppingListSetTextLineItemCustomFieldAction.builder().name("name") },
-                new Object[] { ShoppingListSetTextLineItemCustomFieldAction.builder().value("value") } };
+                new Object[] { "name", ShoppingListSetTextLineItemCustomFieldAction.builder().name("name") },
+                new Object[] { "value", ShoppingListSetTextLineItemCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetTextLineItemCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetTextLineItemCustomTypeActionTest.java
index 178ff5059e3..35453863714 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetTextLineItemCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetTextLineItemCustomTypeActionTest.java
@@ -1,38 +1,32 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetTextLineItemCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetTextLineItemCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetTextLineItemCustomTypeActionBuilder builder) {
         ShoppingListSetTextLineItemCustomTypeAction shoppingListSetTextLineItemCustomTypeAction = builder
                 .buildUnchecked();
         Assertions.assertThat(shoppingListSetTextLineItemCustomTypeAction)
                 .isInstanceOf(ShoppingListSetTextLineItemCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShoppingListSetTextLineItemCustomTypeAction.builder().textLineItemId("textLineItemId") },
-                new Object[] {
+                new Object[] { "textLineItemId",
+                        ShoppingListSetTextLineItemCustomTypeAction.builder().textLineItemId("textLineItemId") },
+                new Object[] { "textLineItemKey",
                         ShoppingListSetTextLineItemCustomTypeAction.builder().textLineItemKey("textLineItemKey") },
-                new Object[] { ShoppingListSetTextLineItemCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { ShoppingListSetTextLineItemCustomTypeAction.builder()
+                new Object[] { "type",
+                        ShoppingListSetTextLineItemCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", ShoppingListSetTextLineItemCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetTextLineItemDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetTextLineItemDescriptionActionTest.java
index db809b01efe..42a56d48762 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetTextLineItemDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListSetTextLineItemDescriptionActionTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.api.models.shopping_list;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListSetTextLineItemDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListSetTextLineItemDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListSetTextLineItemDescriptionActionBuilder builder) {
         ShoppingListSetTextLineItemDescriptionAction shoppingListSetTextLineItemDescriptionAction = builder
                 .buildUnchecked();
         Assertions.assertThat(shoppingListSetTextLineItemDescriptionAction)
                 .isInstanceOf(ShoppingListSetTextLineItemDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "textLineItemId",
                         ShoppingListSetTextLineItemDescriptionAction.builder().textLineItemId("textLineItemId") },
-                new Object[] {
+                new Object[] { "textLineItemKey",
                         ShoppingListSetTextLineItemDescriptionAction.builder().textLineItemKey("textLineItemKey") },
-                new Object[] { ShoppingListSetTextLineItemDescriptionAction.builder()
+                new Object[] { "description", ShoppingListSetTextLineItemDescriptionAction.builder()
                         .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListTest.java
index b82f23cf3dd..921c954a67e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListTest.java
@@ -4,59 +4,59 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListBuilder builder) {
         ShoppingList shoppingList = builder.buildUnchecked();
         Assertions.assertThat(shoppingList).isInstanceOf(ShoppingList.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingList.builder().id("id") },
-                new Object[] { ShoppingList.builder().version(2L) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", ShoppingList.builder().id("id") },
+                new Object[] { "version", ShoppingList.builder().version(2L) },
+                new Object[] { "name",
                         ShoppingList.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShoppingList.builder().key("key") },
-                new Object[] { ShoppingList.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] {
+                new Object[] { "key", ShoppingList.builder().key("key") },
+                new Object[] { "customer",
+                        ShoppingList.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "slug",
                         ShoppingList.builder().slug(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShoppingList.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { ShoppingList.builder()
-                        .lineItems(Collections.singletonList(
-                            new com.commercetools.api.models.shopping_list.ShoppingListLineItemImpl())) },
-                new Object[] { ShoppingList.builder()
-                        .textLineItems(Collections
-                                .singletonList(new com.commercetools.api.models.shopping_list.TextLineItemImpl())) },
-                new Object[] { ShoppingList.builder().deleteDaysAfterLastModification(3L) },
-                new Object[] { ShoppingList.builder().anonymousId("anonymousId") },
-                new Object[] {
+                new Object[] { "description",
+                        ShoppingList.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "lineItems",
+                        ShoppingList.builder()
+                                .lineItems(Collections.singletonList(
+                                    new com.commercetools.api.models.shopping_list.ShoppingListLineItemImpl())) },
+                new Object[] { "textLineItems",
+                        ShoppingList.builder()
+                                .textLineItems(Collections.singletonList(
+                                    new com.commercetools.api.models.shopping_list.TextLineItemImpl())) },
+                new Object[] { "deleteDaysAfterLastModification",
+                        ShoppingList.builder().deleteDaysAfterLastModification(3L) },
+                new Object[] { "anonymousId", ShoppingList.builder().anonymousId("anonymousId") },
+                new Object[] { "store",
                         ShoppingList.builder().store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) },
-                new Object[] { ShoppingList.builder()
+                new Object[] { "businessUnit", ShoppingList.builder()
                         .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] {
+                new Object[] { "custom",
                         ShoppingList.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { ShoppingList.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ShoppingList.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ShoppingList.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+                new Object[] { "createdAt",
+                        ShoppingList.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        ShoppingList.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        ShoppingList.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         ShoppingList.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListUpdateTest.java
index 0e2765648c4..ef4401cdf12 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/ShoppingListUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListUpdateBuilder builder) {
         ShoppingListUpdate shoppingListUpdate = builder.buildUnchecked();
         Assertions.assertThat(shoppingListUpdate).isInstanceOf(ShoppingListUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListUpdate.builder().version(2L) },
-                new Object[] { ShoppingListUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.shopping_list.ShoppingListUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", ShoppingListUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        ShoppingListUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.shopping_list.ShoppingListUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/TextLineItemDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/TextLineItemDraftTest.java
index c9b2bd16a71..fbf8a31a539 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/TextLineItemDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/TextLineItemDraftTest.java
@@ -3,38 +3,34 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TextLineItemDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TextLineItemDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TextLineItemDraftBuilder builder) {
         TextLineItemDraft textLineItemDraft = builder.buildUnchecked();
         Assertions.assertThat(textLineItemDraft).isInstanceOf(TextLineItemDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TextLineItemDraft.builder().key("key") },
-                new Object[] { TextLineItemDraft.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { TextLineItemDraft.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { TextLineItemDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { TextLineItemDraft.builder()
-                        .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { TextLineItemDraft.builder().quantity(8L) } };
+        return new Object[][] { new Object[] { "key", TextLineItemDraft.builder().key("key") },
+                new Object[] { "addedAt",
+                        TextLineItemDraft.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "custom",
+                        TextLineItemDraft.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "description",
+                        TextLineItemDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "name",
+                        TextLineItemDraft.builder()
+                                .name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "quantity", TextLineItemDraft.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/TextLineItemTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/TextLineItemTest.java
index b1e455ca3fb..435a7a12f71 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/TextLineItemTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/shopping_list/TextLineItemTest.java
@@ -3,39 +3,33 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TextLineItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TextLineItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TextLineItemBuilder builder) {
         TextLineItem textLineItem = builder.buildUnchecked();
         Assertions.assertThat(textLineItem).isInstanceOf(TextLineItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { TextLineItem.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+                new Object[] { "addedAt", TextLineItem.builder().addedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "custom",
                         TextLineItem.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { TextLineItem.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { TextLineItem.builder().id("id") }, new Object[] { TextLineItem.builder().key("key") },
-                new Object[] {
+                new Object[] { "description",
+                        TextLineItem.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "id", TextLineItem.builder().id("id") },
+                new Object[] { "key", TextLineItem.builder().key("key") },
+                new Object[] { "name",
                         TextLineItem.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { TextLineItem.builder().quantity(8L) } };
+                new Object[] { "quantity", TextLineItem.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteChangeStagedQuoteStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteChangeStagedQuoteStateActionTest.java
index 489d5539bb8..30d4a40291b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteChangeStagedQuoteStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteChangeStagedQuoteStateActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.staged_quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteChangeStagedQuoteStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteChangeStagedQuoteStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteChangeStagedQuoteStateActionBuilder builder) {
         StagedQuoteChangeStagedQuoteStateAction stagedQuoteChangeStagedQuoteStateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteChangeStagedQuoteStateAction)
                 .isInstanceOf(StagedQuoteChangeStagedQuoteStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedQuoteChangeStagedQuoteStateAction.builder()
-                .stagedQuoteState(
-                    com.commercetools.api.models.staged_quote.StagedQuoteState.findEnum("InProgress")) } };
+        return new Object[][] { new Object[] { "stagedQuoteState",
+                StagedQuoteChangeStagedQuoteStateAction.builder()
+                        .stagedQuoteState(
+                            com.commercetools.api.models.staged_quote.StagedQuoteState.findEnum("InProgress")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteDraftTest.java
index b932ff47c91..cdea5f3886a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteDraftTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.api.models.staged_quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteDraftBuilder builder) {
         StagedQuoteDraft stagedQuoteDraft = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteDraft).isInstanceOf(StagedQuoteDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedQuoteDraft.builder()
+        return new Object[][] { new Object[] { "quoteRequest", StagedQuoteDraft.builder()
                 .quoteRequest(new com.commercetools.api.models.quote_request.QuoteRequestResourceIdentifierImpl()) },
-                new Object[] { StagedQuoteDraft.builder().quoteRequestVersion(8L) },
-                new Object[] { StagedQuoteDraft.builder().quoteRequestStateToAccepted(true) },
-                new Object[] { StagedQuoteDraft.builder().key("key") },
-                new Object[] { StagedQuoteDraft.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { StagedQuoteDraft.builder()
+                new Object[] { "quoteRequestVersion", StagedQuoteDraft.builder().quoteRequestVersion(8L) },
+                new Object[] { "quoteRequestStateToAccepted",
+                        StagedQuoteDraft.builder().quoteRequestStateToAccepted(true) },
+                new Object[] { "key", StagedQuoteDraft.builder().key("key") },
+                new Object[] { "custom",
+                        StagedQuoteDraft.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "state", StagedQuoteDraft.builder()
                         .state(new com.commercetools.api.models.state.StateReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuotePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuotePagedQueryResponseTest.java
index dc1d2bbf7e6..d694cde49a0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuotePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuotePagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuotePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuotePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuotePagedQueryResponseBuilder builder) {
         StagedQuotePagedQueryResponse stagedQuotePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(stagedQuotePagedQueryResponse).isInstanceOf(StagedQuotePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedQuotePagedQueryResponse.builder().limit(7L) },
-                new Object[] { StagedQuotePagedQueryResponse.builder().offset(3L) },
-                new Object[] { StagedQuotePagedQueryResponse.builder().count(2L) },
-                new Object[] { StagedQuotePagedQueryResponse.builder().total(1L) },
-                new Object[] { StagedQuotePagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.staged_quote.StagedQuoteImpl())) } };
+        return new Object[][] { new Object[] { "limit", StagedQuotePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", StagedQuotePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", StagedQuotePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", StagedQuotePagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        StagedQuotePagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.staged_quote.StagedQuoteImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteReferenceTest.java
index 64343875877..576a9b1c6a8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteReferenceTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.staged_quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteReferenceBuilder builder) {
         StagedQuoteReference stagedQuoteReference = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteReference).isInstanceOf(StagedQuoteReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "obj",
                 StagedQuoteReference.builder().obj(new com.commercetools.api.models.staged_quote.StagedQuoteImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteResourceIdentifierTest.java
index b25c3c76e22..8b8833d7d95 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteResourceIdentifierTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.staged_quote;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteResourceIdentifierTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetCustomFieldActionTest.java
index b3afef84765..f2883fabc71 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.staged_quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteSetCustomFieldActionBuilder builder) {
         StagedQuoteSetCustomFieldAction stagedQuoteSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteSetCustomFieldAction).isInstanceOf(StagedQuoteSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedQuoteSetCustomFieldAction.builder().name("name") },
-                new Object[] { StagedQuoteSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", StagedQuoteSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StagedQuoteSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetCustomTypeActionTest.java
index 6dadb4677e6..7b97b49e914 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.staged_quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteSetCustomTypeActionBuilder builder) {
         StagedQuoteSetCustomTypeAction stagedQuoteSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteSetCustomTypeAction).isInstanceOf(StagedQuoteSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedQuoteSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StagedQuoteSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        StagedQuoteSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StagedQuoteSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetSellerCommentActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetSellerCommentActionTest.java
index fa1ba444725..d34de078b6d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetSellerCommentActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetSellerCommentActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.staged_quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteSetSellerCommentActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteSetSellerCommentActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteSetSellerCommentActionBuilder builder) {
         StagedQuoteSetSellerCommentAction stagedQuoteSetSellerCommentAction = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteSetSellerCommentAction).isInstanceOf(StagedQuoteSetSellerCommentAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { StagedQuoteSetSellerCommentAction.builder().sellerComment("sellerComment") } };
+        return new Object[][] { new Object[] { "sellerComment",
+                StagedQuoteSetSellerCommentAction.builder().sellerComment("sellerComment") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetValidToActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetValidToActionTest.java
index 5374deebcdf..371f7d95a8b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetValidToActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteSetValidToActionTest.java
@@ -3,30 +3,22 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteSetValidToActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteSetValidToActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteSetValidToActionBuilder builder) {
         StagedQuoteSetValidToAction stagedQuoteSetValidToAction = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteSetValidToAction).isInstanceOf(StagedQuoteSetValidToAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "validTo",
                 StagedQuoteSetValidToAction.builder().validTo(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteTest.java
index 33d33d3f6a2..a4d7b4323b7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteTest.java
@@ -3,56 +3,55 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteBuilder builder) {
         StagedQuote stagedQuote = builder.buildUnchecked();
         Assertions.assertThat(stagedQuote).isInstanceOf(StagedQuote.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedQuote.builder().id("id") },
-                new Object[] { StagedQuote.builder().version(2L) }, new Object[] { StagedQuote.builder().key("key") },
-                new Object[] { StagedQuote.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StagedQuote.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StagedQuote.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", StagedQuote.builder().id("id") },
+                new Object[] { "version", StagedQuote.builder().version(2L) },
+                new Object[] { "key", StagedQuote.builder().key("key") },
+                new Object[] { "createdAt", StagedQuote.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        StagedQuote.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        StagedQuote.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         StagedQuote.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] {
+                new Object[] { "stagedQuoteState",
                         StagedQuote.builder()
                                 .stagedQuoteState(com.commercetools.api.models.staged_quote.StagedQuoteState
                                         .findEnum("InProgress")) },
-                new Object[] { StagedQuote.builder()
-                        .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
-                new Object[] { StagedQuote.builder()
+                new Object[] { "customer",
+                        StagedQuote.builder()
+                                .customer(new com.commercetools.api.models.customer.CustomerReferenceImpl()) },
+                new Object[] { "quoteRequest", StagedQuote.builder()
                         .quoteRequest(new com.commercetools.api.models.quote_request.QuoteRequestReferenceImpl()) },
-                new Object[] { StagedQuote.builder()
-                        .quotationCart(new com.commercetools.api.models.cart.CartReferenceImpl()) },
-                new Object[] { StagedQuote.builder().validTo(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StagedQuote.builder().sellerComment("sellerComment") },
-                new Object[] { StagedQuote.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] {
+                new Object[] { "quotationCart",
+                        StagedQuote.builder()
+                                .quotationCart(new com.commercetools.api.models.cart.CartReferenceImpl()) },
+                new Object[] { "validTo", StagedQuote.builder().validTo(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "sellerComment", StagedQuote.builder().sellerComment("sellerComment") },
+                new Object[] { "custom",
+                        StagedQuote.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
+                new Object[] { "state",
                         StagedQuote.builder().state(new com.commercetools.api.models.state.StateReferenceImpl()) },
-                new Object[] { StagedQuote.builder().purchaseOrderNumber("purchaseOrderNumber") },
-                new Object[] { StagedQuote.builder()
+                new Object[] { "purchaseOrderNumber",
+                        StagedQuote.builder().purchaseOrderNumber("purchaseOrderNumber") },
+                new Object[] { "businessUnit", StagedQuote.builder()
                         .businessUnit(new com.commercetools.api.models.business_unit.BusinessUnitKeyReferenceImpl()) },
-                new Object[] {
+                new Object[] { "store",
                         StagedQuote.builder().store(new com.commercetools.api.models.store.StoreKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteTransitionStateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteTransitionStateActionTest.java
index 0f76fa95300..72ce4526f10 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteTransitionStateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteTransitionStateActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.staged_quote;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteTransitionStateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteTransitionStateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteTransitionStateActionBuilder builder) {
         StagedQuoteTransitionStateAction stagedQuoteTransitionStateAction = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteTransitionStateAction).isInstanceOf(StagedQuoteTransitionStateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedQuoteTransitionStateAction.builder()
-                        .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
-                new Object[] { StagedQuoteTransitionStateAction.builder().force(true) } };
+                new Object[] { "state",
+                        StagedQuoteTransitionStateAction.builder()
+                                .state(new com.commercetools.api.models.state.StateResourceIdentifierImpl()) },
+                new Object[] { "force", StagedQuoteTransitionStateAction.builder().force(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteUpdateTest.java
index 79967e53493..aab6604f088 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/staged_quote/StagedQuoteUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteUpdateBuilder builder) {
         StagedQuoteUpdate stagedQuoteUpdate = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteUpdate).isInstanceOf(StagedQuoteUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedQuoteUpdate.builder().version(2L) },
-                new Object[] { StagedQuoteUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.staged_quote.StagedQuoteUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", StagedQuoteUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        StagedQuoteUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.staged_quote.StagedQuoteUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StagedPriceDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StagedPriceDraftTest.java
index d2bd1a74e2a..490c7bb44de 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StagedPriceDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StagedPriceDraftTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedPriceDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedPriceDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedPriceDraftBuilder builder) {
         StagedPriceDraft stagedPriceDraft = builder.buildUnchecked();
         Assertions.assertThat(stagedPriceDraft).isInstanceOf(StagedPriceDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "value",
                 StagedPriceDraft.builder().value(new com.commercetools.api.models.common.TypedMoneyDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StagedStandalonePriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StagedStandalonePriceTest.java
index 0db2ba1b49b..ea2e67b6a45 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StagedStandalonePriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StagedStandalonePriceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedStandalonePriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedStandalonePriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedStandalonePriceBuilder builder) {
         StagedStandalonePrice stagedStandalonePrice = builder.buildUnchecked();
         Assertions.assertThat(stagedStandalonePrice).isInstanceOf(StagedStandalonePrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StagedStandalonePrice.builder()
-                        .value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] { StagedStandalonePrice.builder()
+                new Object[] { "value",
+                        StagedStandalonePrice.builder()
+                                .value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
+                new Object[] { "discounted", StagedStandalonePrice.builder()
                         .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceAddPriceTierActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceAddPriceTierActionTest.java
index e7279211fd6..49195c6f1ca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceAddPriceTierActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceAddPriceTierActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceAddPriceTierActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceAddPriceTierActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceAddPriceTierActionBuilder builder) {
         StandalonePriceAddPriceTierAction standalonePriceAddPriceTierAction = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceAddPriceTierAction).isInstanceOf(StandalonePriceAddPriceTierAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceAddPriceTierAction.builder()
+        return new Object[][] { new Object[] { "tier", StandalonePriceAddPriceTierAction.builder()
                 .tier(new com.commercetools.api.models.common.PriceTierDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceApplyStagedChangesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceApplyStagedChangesActionTest.java
index 20a0be3c265..909da703dca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceApplyStagedChangesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceApplyStagedChangesActionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceApplyStagedChangesActionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceChangeActiveActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceChangeActiveActionTest.java
index 8aa86da4180..b3d40bec37d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceChangeActiveActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceChangeActiveActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceChangeActiveActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceChangeActiveActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceChangeActiveActionBuilder builder) {
         StandalonePriceChangeActiveAction standalonePriceChangeActiveAction = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceChangeActiveAction).isInstanceOf(StandalonePriceChangeActiveAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceChangeActiveAction.builder().active(true) } };
+        return new Object[][] { new Object[] { "active", StandalonePriceChangeActiveAction.builder().active(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceChangeValueActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceChangeValueActionTest.java
index 3e445cbf949..77ec6bd9837 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceChangeValueActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceChangeValueActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceChangeValueActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceChangeValueActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceChangeValueActionBuilder builder) {
         StandalonePriceChangeValueAction standalonePriceChangeValueAction = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceChangeValueAction).isInstanceOf(StandalonePriceChangeValueAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceChangeValueAction.builder()
-                        .value(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { StandalonePriceChangeValueAction.builder().staged(true) } };
+                new Object[] { "value",
+                        StandalonePriceChangeValueAction.builder()
+                                .value(new com.commercetools.api.models.common.MoneyImpl()) },
+                new Object[] { "staged", StandalonePriceChangeValueAction.builder().staged(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceDraftTest.java
index a216106f3b3..c65c04ff331 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceDraftTest.java
@@ -4,52 +4,50 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceDraftBuilder builder) {
         StandalonePriceDraft standalonePriceDraft = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceDraft).isInstanceOf(StandalonePriceDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceDraft.builder().key("key") },
-                new Object[] { StandalonePriceDraft.builder().sku("sku") },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", StandalonePriceDraft.builder().key("key") },
+                new Object[] { "sku", StandalonePriceDraft.builder().sku("sku") },
+                new Object[] { "value",
                         StandalonePriceDraft.builder().value(new com.commercetools.api.models.common.MoneyImpl()) },
-                new Object[] { StandalonePriceDraft.builder().country("country") },
-                new Object[] { StandalonePriceDraft.builder()
+                new Object[] { "country", StandalonePriceDraft.builder().country("country") },
+                new Object[] { "customerGroup", StandalonePriceDraft.builder()
                         .customerGroup(
                             new com.commercetools.api.models.customer_group.CustomerGroupResourceIdentifierImpl()) },
-                new Object[] { StandalonePriceDraft.builder()
-                        .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
-                new Object[] { StandalonePriceDraft.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceDraft.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+                new Object[] { "channel",
+                        StandalonePriceDraft.builder()
+                                .channel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) },
+                new Object[] { "validFrom",
+                        StandalonePriceDraft.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        StandalonePriceDraft.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "tiers",
                         StandalonePriceDraft.builder()
                                 .tiers(Collections
                                         .singletonList(new com.commercetools.api.models.common.PriceTierDraftImpl())) },
-                new Object[] { StandalonePriceDraft.builder()
-                        .discounted(new com.commercetools.api.models.common.DiscountedPriceDraftImpl()) },
-                new Object[] { StandalonePriceDraft.builder()
-                        .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
-                new Object[] { StandalonePriceDraft.builder()
-                        .staged(new com.commercetools.api.models.standalone_price.StagedPriceDraftImpl()) },
-                new Object[] { StandalonePriceDraft.builder().active(true) } };
+                new Object[] { "discounted",
+                        StandalonePriceDraft.builder()
+                                .discounted(new com.commercetools.api.models.common.DiscountedPriceDraftImpl()) },
+                new Object[] { "custom",
+                        StandalonePriceDraft.builder()
+                                .custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) },
+                new Object[] { "staged",
+                        StandalonePriceDraft.builder()
+                                .staged(new com.commercetools.api.models.standalone_price.StagedPriceDraftImpl()) },
+                new Object[] { "active", StandalonePriceDraft.builder().active(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePricePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePricePagedQueryResponseTest.java
index b30f3eec0fc..1fe2de7941e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePricePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePricePagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePricePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePricePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePricePagedQueryResponseBuilder builder) {
         StandalonePricePagedQueryResponse standalonePricePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(standalonePricePagedQueryResponse).isInstanceOf(StandalonePricePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePricePagedQueryResponse.builder().limit(7L) },
-                new Object[] { StandalonePricePagedQueryResponse.builder().offset(3L) },
-                new Object[] { StandalonePricePagedQueryResponse.builder().count(2L) },
-                new Object[] { StandalonePricePagedQueryResponse.builder().total(1L) },
-                new Object[] { StandalonePricePagedQueryResponse.builder()
-                        .results(Collections.singletonList(
-                            new com.commercetools.api.models.standalone_price.StandalonePriceImpl())) } };
+        return new Object[][] { new Object[] { "limit", StandalonePricePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", StandalonePricePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", StandalonePricePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", StandalonePricePagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        StandalonePricePagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.standalone_price.StandalonePriceImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceReferenceTest.java
index fea2c21daf0..b32c7ec4956 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceReferenceTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceReferenceBuilder builder) {
         StandalonePriceReference standalonePriceReference = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceReference).isInstanceOf(StandalonePriceReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceReference.builder()
+        return new Object[][] { new Object[] { "obj", StandalonePriceReference.builder()
                 .obj(new com.commercetools.api.models.standalone_price.StandalonePriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceRemovePriceTierActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceRemovePriceTierActionTest.java
index 83bcd55f5f8..ae8768df83d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceRemovePriceTierActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceRemovePriceTierActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceRemovePriceTierActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceRemovePriceTierActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceRemovePriceTierActionBuilder builder) {
         StandalonePriceRemovePriceTierAction standalonePriceRemovePriceTierAction = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceRemovePriceTierAction)
                 .isInstanceOf(StandalonePriceRemovePriceTierAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { StandalonePriceRemovePriceTierAction.builder().tierMinimumQuantity(3L) } };
+        return new Object[][] { new Object[] { "tierMinimumQuantity",
+                StandalonePriceRemovePriceTierAction.builder().tierMinimumQuantity(3L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceRemoveStagedChangesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceRemoveStagedChangesActionTest.java
index 2a65040487b..77e78e92874 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceRemoveStagedChangesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceRemoveStagedChangesActionTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceRemoveStagedChangesActionTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceResourceIdentifierTest.java
index dbd03f1291d..075c2ebeb54 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceResourceIdentifierTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceResourceIdentifierTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetCustomFieldActionTest.java
index e3c66ea5d03..3f644d05ee4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetCustomFieldActionTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceSetCustomFieldActionBuilder builder) {
         StandalonePriceSetCustomFieldAction standalonePriceSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceSetCustomFieldAction)
                 .isInstanceOf(StandalonePriceSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceSetCustomFieldAction.builder().name("name") },
-                new Object[] { StandalonePriceSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", StandalonePriceSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StandalonePriceSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetCustomTypeActionTest.java
index 8f57fbcb038..8ec0d4fc551 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetCustomTypeActionTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceSetCustomTypeActionBuilder builder) {
         StandalonePriceSetCustomTypeAction standalonePriceSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceSetCustomTypeAction)
                 .isInstanceOf(StandalonePriceSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StandalonePriceSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        StandalonePriceSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StandalonePriceSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetDiscountedPriceActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetDiscountedPriceActionTest.java
index 3869c1a603b..716028c01ab 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetDiscountedPriceActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetDiscountedPriceActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceSetDiscountedPriceActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceSetDiscountedPriceActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceSetDiscountedPriceActionBuilder builder) {
         StandalonePriceSetDiscountedPriceAction standalonePriceSetDiscountedPriceAction = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceSetDiscountedPriceAction)
                 .isInstanceOf(StandalonePriceSetDiscountedPriceAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceSetDiscountedPriceAction.builder()
+        return new Object[][] { new Object[] { "discounted", StandalonePriceSetDiscountedPriceAction.builder()
                 .discounted(new com.commercetools.api.models.common.DiscountedPriceDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetKeyActionTest.java
index 8925c7c3acc..8b3af608de1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.standalone_price;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceSetKeyActionBuilder builder) {
         StandalonePriceSetKeyAction standalonePriceSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceSetKeyAction).isInstanceOf(StandalonePriceSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", StandalonePriceSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetPriceTiersActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetPriceTiersActionTest.java
index 4a6c414de52..e6d80a64c3a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetPriceTiersActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetPriceTiersActionTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceSetPriceTiersActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceSetPriceTiersActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceSetPriceTiersActionBuilder builder) {
         StandalonePriceSetPriceTiersAction standalonePriceSetPriceTiersAction = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceSetPriceTiersAction)
                 .isInstanceOf(StandalonePriceSetPriceTiersAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceSetPriceTiersAction.builder()
+        return new Object[][] { new Object[] { "tiers", StandalonePriceSetPriceTiersAction.builder()
                 .tiers(Collections.singletonList(new com.commercetools.api.models.common.PriceTierDraftImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetValidFromActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetValidFromActionTest.java
index 5c2e335b947..7007499365a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetValidFromActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetValidFromActionTest.java
@@ -3,30 +3,22 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceSetValidFromActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceSetValidFromActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceSetValidFromActionBuilder builder) {
         StandalonePriceSetValidFromAction standalonePriceSetValidFromAction = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceSetValidFromAction).isInstanceOf(StandalonePriceSetValidFromAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "validFrom",
                 StandalonePriceSetValidFromAction.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetValidFromAndUntilActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetValidFromAndUntilActionTest.java
index 792bf9b70b6..239e9e7895f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetValidFromAndUntilActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetValidFromAndUntilActionTest.java
@@ -3,34 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceSetValidFromAndUntilActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceSetValidFromAndUntilActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceSetValidFromAndUntilActionBuilder builder) {
         StandalonePriceSetValidFromAndUntilAction standalonePriceSetValidFromAndUntilAction = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceSetValidFromAndUntilAction)
                 .isInstanceOf(StandalonePriceSetValidFromAndUntilAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StandalonePriceSetValidFromAndUntilAction.builder()
-                        .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceSetValidFromAndUntilAction.builder()
+                new Object[] { "validFrom",
+                        StandalonePriceSetValidFromAndUntilAction.builder()
+                                .validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil", StandalonePriceSetValidFromAndUntilAction.builder()
                         .validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetValidUntilActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetValidUntilActionTest.java
index cc6d5051684..02fba01f2c8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetValidUntilActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceSetValidUntilActionTest.java
@@ -3,31 +3,23 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceSetValidUntilActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceSetValidUntilActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceSetValidUntilActionBuilder builder) {
         StandalonePriceSetValidUntilAction standalonePriceSetValidUntilAction = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceSetValidUntilAction)
                 .isInstanceOf(StandalonePriceSetValidUntilAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "validUntil",
                 StandalonePriceSetValidUntilAction.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceTest.java
index 26d26f4a124..216c432a38a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceTest.java
@@ -4,57 +4,58 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceBuilder builder) {
         StandalonePrice standalonePrice = builder.buildUnchecked();
         Assertions.assertThat(standalonePrice).isInstanceOf(StandalonePrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePrice.builder().id("id") },
-                new Object[] { StandalonePrice.builder().version(2L) },
-                new Object[] { StandalonePrice.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePrice.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePrice.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", StandalonePrice.builder().id("id") },
+                new Object[] { "version", StandalonePrice.builder().version(2L) },
+                new Object[] { "createdAt",
+                        StandalonePrice.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        StandalonePrice.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        StandalonePrice.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         StandalonePrice.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { StandalonePrice.builder().key("key") },
-                new Object[] { StandalonePrice.builder().sku("sku") },
-                new Object[] {
+                new Object[] { "key", StandalonePrice.builder().key("key") },
+                new Object[] { "sku", StandalonePrice.builder().sku("sku") },
+                new Object[] { "value",
                         StandalonePrice.builder().value(new com.commercetools.api.models.common.TypedMoneyImpl()) },
-                new Object[] { StandalonePrice.builder().country("country") },
-                new Object[] { StandalonePrice.builder()
+                new Object[] { "country", StandalonePrice.builder().country("country") },
+                new Object[] { "customerGroup", StandalonePrice.builder()
                         .customerGroup(new com.commercetools.api.models.customer_group.CustomerGroupReferenceImpl()) },
-                new Object[] { StandalonePrice.builder()
-                        .channel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
-                new Object[] { StandalonePrice.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePrice.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePrice.builder()
-                        .tiers(Collections.singletonList(new com.commercetools.api.models.common.PriceTierImpl())) },
-                new Object[] { StandalonePrice.builder()
-                        .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) },
-                new Object[] {
+                new Object[] { "channel",
+                        StandalonePrice.builder()
+                                .channel(new com.commercetools.api.models.channel.ChannelReferenceImpl()) },
+                new Object[] { "validFrom",
+                        StandalonePrice.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        StandalonePrice.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "tiers",
+                        StandalonePrice.builder()
+                                .tiers(Collections
+                                        .singletonList(new com.commercetools.api.models.common.PriceTierImpl())) },
+                new Object[] { "discounted",
+                        StandalonePrice.builder()
+                                .discounted(new com.commercetools.api.models.common.DiscountedPriceImpl()) },
+                new Object[] { "custom",
                         StandalonePrice.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) },
-                new Object[] { StandalonePrice.builder()
+                new Object[] { "staged", StandalonePrice.builder()
                         .staged(new com.commercetools.api.models.standalone_price.StagedStandalonePriceImpl()) },
-                new Object[] { StandalonePrice.builder().active(true) } };
+                new Object[] { "active", StandalonePrice.builder().active(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceUpdateTest.java
index 8e31f5d5a7f..1db15c58493 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/standalone_price/StandalonePriceUpdateTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceUpdateBuilder builder) {
         StandalonePriceUpdate standalonePriceUpdate = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceUpdate).isInstanceOf(StandalonePriceUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceUpdate.builder().version(2L) },
-                new Object[] { StandalonePriceUpdate.builder()
+        return new Object[][] { new Object[] { "version", StandalonePriceUpdate.builder().version(2L) },
+                new Object[] { "actions", StandalonePriceUpdate.builder()
                         .actions(Collections.singletonList(
                             new com.commercetools.api.models.standalone_price.StandalonePriceUpdateActionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateAddRolesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateAddRolesActionTest.java
index f74cefafb39..2247c842e6a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateAddRolesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateAddRolesActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateAddRolesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateAddRolesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateAddRolesActionBuilder builder) {
         StateAddRolesAction stateAddRolesAction = builder.buildUnchecked();
         Assertions.assertThat(stateAddRolesAction).isInstanceOf(StateAddRolesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StateAddRolesAction.builder()
+        return new Object[][] { new Object[] { "roles", StateAddRolesAction.builder()
                 .roles(Collections.singletonList(
                     com.commercetools.api.models.state.StateRoleEnum.findEnum("ReviewIncludedInStatistics"))) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateChangeInitialActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateChangeInitialActionTest.java
index 5c190cd894a..b3b191784f8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateChangeInitialActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateChangeInitialActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.state;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateChangeInitialActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateChangeInitialActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateChangeInitialActionBuilder builder) {
         StateChangeInitialAction stateChangeInitialAction = builder.buildUnchecked();
         Assertions.assertThat(stateChangeInitialAction).isInstanceOf(StateChangeInitialAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StateChangeInitialAction.builder().initial(true) } };
+        return new Object[][] { new Object[] { "initial", StateChangeInitialAction.builder().initial(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateChangeKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateChangeKeyActionTest.java
index 34246e21d50..bdef31aadca 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateChangeKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateChangeKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.state;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateChangeKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateChangeKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateChangeKeyActionBuilder builder) {
         StateChangeKeyAction stateChangeKeyAction = builder.buildUnchecked();
         Assertions.assertThat(stateChangeKeyAction).isInstanceOf(StateChangeKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StateChangeKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", StateChangeKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateChangeTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateChangeTypeActionTest.java
index c623337cf40..2b7b5d3ddc9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateChangeTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateChangeTypeActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.state;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateChangeTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateChangeTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateChangeTypeActionBuilder builder) {
         StateChangeTypeAction stateChangeTypeAction = builder.buildUnchecked();
         Assertions.assertThat(stateChangeTypeAction).isInstanceOf(StateChangeTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StateChangeTypeAction.builder()
+        return new Object[][] { new Object[] { "type", StateChangeTypeAction.builder()
                 .type(com.commercetools.api.models.state.StateTypeEnum.findEnum("OrderState")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateDraftTest.java
index 14ed17b5c8e..137977055a4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateDraftTest.java
@@ -3,43 +3,38 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateDraftBuilder builder) {
         StateDraft stateDraft = builder.buildUnchecked();
         Assertions.assertThat(stateDraft).isInstanceOf(StateDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StateDraft.builder().key("key") },
-                new Object[] { StateDraft.builder()
-                        .type(com.commercetools.api.models.state.StateTypeEnum.findEnum("OrderState")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", StateDraft.builder().key("key") },
+                new Object[] { "type",
+                        StateDraft.builder()
+                                .type(com.commercetools.api.models.state.StateTypeEnum.findEnum("OrderState")) },
+                new Object[] { "name",
                         StateDraft.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { StateDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { StateDraft.builder().initial(true) },
-                new Object[] { StateDraft.builder()
+                new Object[] { "description",
+                        StateDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "initial", StateDraft.builder().initial(true) },
+                new Object[] { "roles", StateDraft.builder()
                         .roles(Collections.singletonList(
                             com.commercetools.api.models.state.StateRoleEnum.findEnum("ReviewIncludedInStatistics"))) },
-                new Object[] { StateDraft.builder()
-                        .transitions(Collections.singletonList(
-                            new com.commercetools.api.models.state.StateResourceIdentifierImpl())) } };
+                new Object[] { "transitions",
+                        StateDraft.builder()
+                                .transitions(Collections.singletonList(
+                                    new com.commercetools.api.models.state.StateResourceIdentifierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StatePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StatePagedQueryResponseTest.java
index 8ef4ec4158d..2c067e18bbd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StatePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StatePagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StatePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StatePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StatePagedQueryResponseBuilder builder) {
         StatePagedQueryResponse statePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(statePagedQueryResponse).isInstanceOf(StatePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StatePagedQueryResponse.builder().limit(7L) },
-                new Object[] { StatePagedQueryResponse.builder().offset(3L) },
-                new Object[] { StatePagedQueryResponse.builder().count(2L) },
-                new Object[] { StatePagedQueryResponse.builder().total(1L) },
-                new Object[] { StatePagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", StatePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", StatePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", StatePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", StatePagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", StatePagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.state.StateImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateReferenceTest.java
index 0d93f829f6e..de216b0ab1f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateReferenceTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.state;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateReferenceBuilder builder) {
         StateReference stateReference = builder.buildUnchecked();
         Assertions.assertThat(stateReference).isInstanceOf(StateReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StateReference.builder().obj(new com.commercetools.api.models.state.StateImpl()) },
-                new Object[] { StateReference.builder().id("id") } };
+                new Object[] { "obj",
+                        StateReference.builder().obj(new com.commercetools.api.models.state.StateImpl()) },
+                new Object[] { "id", StateReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateRemoveRolesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateRemoveRolesActionTest.java
index e7cab070caa..3f53d12d521 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateRemoveRolesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateRemoveRolesActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateRemoveRolesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateRemoveRolesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateRemoveRolesActionBuilder builder) {
         StateRemoveRolesAction stateRemoveRolesAction = builder.buildUnchecked();
         Assertions.assertThat(stateRemoveRolesAction).isInstanceOf(StateRemoveRolesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StateRemoveRolesAction.builder()
+        return new Object[][] { new Object[] { "roles", StateRemoveRolesAction.builder()
                 .roles(Collections.singletonList(
                     com.commercetools.api.models.state.StateRoleEnum.findEnum("ReviewIncludedInStatistics"))) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateResourceIdentifierTest.java
index 3caf08517fb..9ea54372634 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.state;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateResourceIdentifierBuilder builder) {
         StateResourceIdentifier stateResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(stateResourceIdentifier).isInstanceOf(StateResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StateResourceIdentifier.builder().id("id") },
-                new Object[] { StateResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", StateResourceIdentifier.builder().id("id") },
+                new Object[] { "key", StateResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetDescriptionActionTest.java
index 3c5b34ae792..9a777bb88ba 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetDescriptionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.state;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateSetDescriptionActionBuilder builder) {
         StateSetDescriptionAction stateSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(stateSetDescriptionAction).isInstanceOf(StateSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StateSetDescriptionAction.builder()
+        return new Object[][] { new Object[] { "description", StateSetDescriptionAction.builder()
                 .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetNameActionTest.java
index 35b9260001b..e85055f3409 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.state;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateSetNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateSetNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateSetNameActionBuilder builder) {
         StateSetNameAction stateSetNameAction = builder.buildUnchecked();
         Assertions.assertThat(stateSetNameAction).isInstanceOf(StateSetNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "name",
                 StateSetNameAction.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetRolesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetRolesActionTest.java
index b20f2c38ea6..8810fe7348d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetRolesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetRolesActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateSetRolesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateSetRolesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateSetRolesActionBuilder builder) {
         StateSetRolesAction stateSetRolesAction = builder.buildUnchecked();
         Assertions.assertThat(stateSetRolesAction).isInstanceOf(StateSetRolesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StateSetRolesAction.builder()
+        return new Object[][] { new Object[] { "roles", StateSetRolesAction.builder()
                 .roles(Collections.singletonList(
                     com.commercetools.api.models.state.StateRoleEnum.findEnum("ReviewIncludedInStatistics"))) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetTransitionsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetTransitionsActionTest.java
index e8e5a6db90a..ce270f1db06 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetTransitionsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateSetTransitionsActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateSetTransitionsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateSetTransitionsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateSetTransitionsActionBuilder builder) {
         StateSetTransitionsAction stateSetTransitionsAction = builder.buildUnchecked();
         Assertions.assertThat(stateSetTransitionsAction).isInstanceOf(StateSetTransitionsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StateSetTransitionsAction.builder()
-                .transitions(Collections
-                        .singletonList(new com.commercetools.api.models.state.StateResourceIdentifierImpl())) } };
+        return new Object[][] { new Object[] { "transitions",
+                StateSetTransitionsAction.builder()
+                        .transitions(Collections.singletonList(
+                            new com.commercetools.api.models.state.StateResourceIdentifierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateTest.java
index 490e0fbb804..b47161ff90e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateTest.java
@@ -4,46 +4,43 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateBuilder builder) {
         State state = builder.buildUnchecked();
         Assertions.assertThat(state).isInstanceOf(State.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { State.builder().id("id") }, new Object[] { State.builder().version(2L) },
-                new Object[] { State.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { State.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", State.builder().id("id") },
+                new Object[] { "version", State.builder().version(2L) },
+                new Object[] { "createdAt", State.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        State.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
                         State.builder().lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { State.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { State.builder().key("key") },
-                new Object[] {
+                new Object[] { "createdBy",
+                        State.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
+                new Object[] { "key", State.builder().key("key") },
+                new Object[] { "type",
                         State.builder().type(com.commercetools.api.models.state.StateTypeEnum.findEnum("OrderState")) },
-                new Object[] { State.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+                new Object[] { "name",
+                        State.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
                         State.builder().description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { State.builder().initial(true) }, new Object[] { State.builder().builtIn(true) },
-                new Object[] { State.builder()
+                new Object[] { "initial", State.builder().initial(true) },
+                new Object[] { "builtIn", State.builder().builtIn(true) },
+                new Object[] { "roles", State.builder()
                         .roles(Collections.singletonList(
                             com.commercetools.api.models.state.StateRoleEnum.findEnum("ReviewIncludedInStatistics"))) },
-                new Object[] { State.builder()
+                new Object[] { "transitions", State.builder()
                         .transitions(
                             Collections.singletonList(new com.commercetools.api.models.state.StateReferenceImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateUpdateTest.java
index d0e442e466c..1e3d014b3e3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/state/StateUpdateTest.java
@@ -3,31 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StateUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StateUpdateBuilder builder) {
         StateUpdate stateUpdate = builder.buildUnchecked();
         Assertions.assertThat(stateUpdate).isInstanceOf(StateUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StateUpdate.builder().version(2L) }, new Object[] { StateUpdate.builder()
-                .actions(Collections.singletonList(new com.commercetools.api.models.state.StateUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", StateUpdate.builder().version(2L) }, new Object[] { "actions",
+                StateUpdate.builder()
+                        .actions(Collections
+                                .singletonList(new com.commercetools.api.models.state.StateUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/ProductSelectionSettingDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/ProductSelectionSettingDraftTest.java
index 02b24c43fe5..9013eff534b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/ProductSelectionSettingDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/ProductSelectionSettingDraftTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionSettingDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionSettingDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionSettingDraftBuilder builder) {
         ProductSelectionSettingDraft productSelectionSettingDraft = builder.buildUnchecked();
         Assertions.assertThat(productSelectionSettingDraft).isInstanceOf(ProductSelectionSettingDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionSettingDraft.builder()
+        return new Object[][] { new Object[] { "productSelection", ProductSelectionSettingDraft.builder()
                 .productSelection(
                     new com.commercetools.api.models.product_selection.ProductSelectionResourceIdentifierImpl()) },
-                new Object[] { ProductSelectionSettingDraft.builder().active(true) } };
+                new Object[] { "active", ProductSelectionSettingDraft.builder().active(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/ProductSelectionSettingTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/ProductSelectionSettingTest.java
index bde5c9e7973..bf70df2e4e7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/ProductSelectionSettingTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/ProductSelectionSettingTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionSettingTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionSettingBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionSettingBuilder builder) {
         ProductSelectionSetting productSelectionSetting = builder.buildUnchecked();
         Assertions.assertThat(productSelectionSetting).isInstanceOf(ProductSelectionSetting.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductSelectionSetting.builder()
+        return new Object[][] { new Object[] { "productSelection", ProductSelectionSetting.builder()
                 .productSelection(new com.commercetools.api.models.product_selection.ProductSelectionReferenceImpl()) },
-                new Object[] { ProductSelectionSetting.builder().active(true) } };
+                new Object[] { "active", ProductSelectionSetting.builder().active(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddCountryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddCountryActionTest.java
index d8f70023258..c29033ac0d8 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddCountryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddCountryActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreAddCountryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreAddCountryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreAddCountryActionBuilder builder) {
         StoreAddCountryAction storeAddCountryAction = builder.buildUnchecked();
         Assertions.assertThat(storeAddCountryAction).isInstanceOf(StoreAddCountryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreAddCountryAction.builder()
+        return new Object[][] { new Object[] { "country", StoreAddCountryAction.builder()
                 .country(new com.commercetools.api.models.store_country.StoreCountryImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddDistributionChannelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddDistributionChannelActionTest.java
index f0b4070236f..1b4051244f5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddDistributionChannelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddDistributionChannelActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreAddDistributionChannelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreAddDistributionChannelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreAddDistributionChannelActionBuilder builder) {
         StoreAddDistributionChannelAction storeAddDistributionChannelAction = builder.buildUnchecked();
         Assertions.assertThat(storeAddDistributionChannelAction).isInstanceOf(StoreAddDistributionChannelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreAddDistributionChannelAction.builder()
+        return new Object[][] { new Object[] { "distributionChannel", StoreAddDistributionChannelAction.builder()
                 .distributionChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddProductSelectionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddProductSelectionActionTest.java
index 4104b583d99..5e66d774b8c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddProductSelectionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddProductSelectionActionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreAddProductSelectionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreAddProductSelectionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreAddProductSelectionActionBuilder builder) {
         StoreAddProductSelectionAction storeAddProductSelectionAction = builder.buildUnchecked();
         Assertions.assertThat(storeAddProductSelectionAction).isInstanceOf(StoreAddProductSelectionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreAddProductSelectionAction.builder()
+        return new Object[][] { new Object[] { "productSelection", StoreAddProductSelectionAction.builder()
                 .productSelection(
                     new com.commercetools.api.models.product_selection.ProductSelectionResourceIdentifierImpl()) },
-                new Object[] { StoreAddProductSelectionAction.builder().active(true) } };
+                new Object[] { "active", StoreAddProductSelectionAction.builder().active(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddSupplyChannelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddSupplyChannelActionTest.java
index d81cf13f245..67b0765111d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddSupplyChannelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreAddSupplyChannelActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreAddSupplyChannelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreAddSupplyChannelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreAddSupplyChannelActionBuilder builder) {
         StoreAddSupplyChannelAction storeAddSupplyChannelAction = builder.buildUnchecked();
         Assertions.assertThat(storeAddSupplyChannelAction).isInstanceOf(StoreAddSupplyChannelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreAddSupplyChannelAction.builder()
+        return new Object[][] { new Object[] { "supplyChannel", StoreAddSupplyChannelAction.builder()
                 .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreChangeProductSelectionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreChangeProductSelectionActionTest.java
index 85d4f9e2a7a..805ae7bc08b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreChangeProductSelectionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreChangeProductSelectionActionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreChangeProductSelectionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreChangeProductSelectionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreChangeProductSelectionActionBuilder builder) {
         StoreChangeProductSelectionAction storeChangeProductSelectionAction = builder.buildUnchecked();
         Assertions.assertThat(storeChangeProductSelectionAction).isInstanceOf(StoreChangeProductSelectionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreChangeProductSelectionAction.builder()
+        return new Object[][] { new Object[] { "productSelection", StoreChangeProductSelectionAction.builder()
                 .productSelection(
                     new com.commercetools.api.models.product_selection.ProductSelectionResourceIdentifierImpl()) },
-                new Object[] { StoreChangeProductSelectionAction.builder().active(true) } };
+                new Object[] { "active", StoreChangeProductSelectionAction.builder().active(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreDraftTest.java
index f0f8d9cb94e..c0c092cd668 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreDraftTest.java
@@ -3,46 +3,42 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreDraftBuilder builder) {
         StoreDraft storeDraft = builder.buildUnchecked();
         Assertions.assertThat(storeDraft).isInstanceOf(StoreDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreDraft.builder().key("key") },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", StoreDraft.builder().key("key") },
+                new Object[] { "name",
                         StoreDraft.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { StoreDraft.builder().languages(Collections.singletonList("languages")) },
-                new Object[] { StoreDraft.builder()
-                        .countries(Collections
-                                .singletonList(new com.commercetools.api.models.store_country.StoreCountryImpl())) },
-                new Object[] { StoreDraft.builder()
-                        .distributionChannels(Collections.singletonList(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl())) },
-                new Object[] { StoreDraft.builder()
-                        .supplyChannels(Collections.singletonList(
-                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl())) },
-                new Object[] { StoreDraft.builder()
-                        .productSelections(Collections.singletonList(
-                            new com.commercetools.api.models.store.ProductSelectionSettingDraftImpl())) },
-                new Object[] {
+                new Object[] { "languages", StoreDraft.builder().languages(Collections.singletonList("languages")) },
+                new Object[] { "countries",
+                        StoreDraft.builder()
+                                .countries(Collections.singletonList(
+                                    new com.commercetools.api.models.store_country.StoreCountryImpl())) },
+                new Object[] { "distributionChannels",
+                        StoreDraft.builder()
+                                .distributionChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl())) },
+                new Object[] { "supplyChannels",
+                        StoreDraft.builder()
+                                .supplyChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl())) },
+                new Object[] { "productSelections",
+                        StoreDraft.builder()
+                                .productSelections(Collections.singletonList(
+                                    new com.commercetools.api.models.store.ProductSelectionSettingDraftImpl())) },
+                new Object[] { "custom",
                         StoreDraft.builder().custom(new com.commercetools.api.models.type.CustomFieldsDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreKeyReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreKeyReferenceTest.java
index 1d114c0c778..a2708c79afb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreKeyReferenceTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreKeyReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreKeyReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreKeyReferenceBuilder builder) {
         StoreKeyReference storeKeyReference = builder.buildUnchecked();
         Assertions.assertThat(storeKeyReference).isInstanceOf(StoreKeyReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreKeyReference.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", StoreKeyReference.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StorePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StorePagedQueryResponseTest.java
index 40d80c99f72..065e8ff34cb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StorePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StorePagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StorePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StorePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StorePagedQueryResponseBuilder builder) {
         StorePagedQueryResponse storePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(storePagedQueryResponse).isInstanceOf(StorePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StorePagedQueryResponse.builder().limit(7L) },
-                new Object[] { StorePagedQueryResponse.builder().offset(3L) },
-                new Object[] { StorePagedQueryResponse.builder().count(2L) },
-                new Object[] { StorePagedQueryResponse.builder().total(1L) },
-                new Object[] { StorePagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", StorePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", StorePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", StorePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", StorePagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", StorePagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.store.StoreImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreReferenceTest.java
index 0e700afc64a..a01f835fca0 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreReferenceTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreReferenceBuilder builder) {
         StoreReference storeReference = builder.buildUnchecked();
         Assertions.assertThat(storeReference).isInstanceOf(StoreReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreReference.builder().obj(new com.commercetools.api.models.store.StoreImpl()) },
-                new Object[] { StoreReference.builder().id("id") } };
+                new Object[] { "obj",
+                        StoreReference.builder().obj(new com.commercetools.api.models.store.StoreImpl()) },
+                new Object[] { "id", StoreReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveCountryActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveCountryActionTest.java
index 936f59c288e..d934b9c857f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveCountryActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveCountryActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreRemoveCountryActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreRemoveCountryActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreRemoveCountryActionBuilder builder) {
         StoreRemoveCountryAction storeRemoveCountryAction = builder.buildUnchecked();
         Assertions.assertThat(storeRemoveCountryAction).isInstanceOf(StoreRemoveCountryAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreRemoveCountryAction.builder()
+        return new Object[][] { new Object[] { "country", StoreRemoveCountryAction.builder()
                 .country(new com.commercetools.api.models.store_country.StoreCountryImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveDistributionChannelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveDistributionChannelActionTest.java
index 0537eddb2e0..5d679eb3f55 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveDistributionChannelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveDistributionChannelActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreRemoveDistributionChannelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreRemoveDistributionChannelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreRemoveDistributionChannelActionBuilder builder) {
         StoreRemoveDistributionChannelAction storeRemoveDistributionChannelAction = builder.buildUnchecked();
         Assertions.assertThat(storeRemoveDistributionChannelAction)
                 .isInstanceOf(StoreRemoveDistributionChannelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreRemoveDistributionChannelAction.builder()
+        return new Object[][] { new Object[] { "distributionChannel", StoreRemoveDistributionChannelAction.builder()
                 .distributionChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveProductSelectionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveProductSelectionActionTest.java
index c7f0458d13a..8733af99f58 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveProductSelectionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveProductSelectionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreRemoveProductSelectionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreRemoveProductSelectionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreRemoveProductSelectionActionBuilder builder) {
         StoreRemoveProductSelectionAction storeRemoveProductSelectionAction = builder.buildUnchecked();
         Assertions.assertThat(storeRemoveProductSelectionAction).isInstanceOf(StoreRemoveProductSelectionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreRemoveProductSelectionAction.builder()
+        return new Object[][] { new Object[] { "productSelection", StoreRemoveProductSelectionAction.builder()
                 .productSelection(
                     new com.commercetools.api.models.product_selection.ProductSelectionResourceIdentifierImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveSupplyChannelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveSupplyChannelActionTest.java
index 8c5dff6f348..60917681eb3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveSupplyChannelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreRemoveSupplyChannelActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreRemoveSupplyChannelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreRemoveSupplyChannelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreRemoveSupplyChannelActionBuilder builder) {
         StoreRemoveSupplyChannelAction storeRemoveSupplyChannelAction = builder.buildUnchecked();
         Assertions.assertThat(storeRemoveSupplyChannelAction).isInstanceOf(StoreRemoveSupplyChannelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreRemoveSupplyChannelAction.builder()
+        return new Object[][] { new Object[] { "supplyChannel", StoreRemoveSupplyChannelAction.builder()
                 .supplyChannel(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreResourceIdentifierTest.java
index d6a35f0d419..0093a553ef5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreResourceIdentifierBuilder builder) {
         StoreResourceIdentifier storeResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(storeResourceIdentifier).isInstanceOf(StoreResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreResourceIdentifier.builder().id("id") },
-                new Object[] { StoreResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", StoreResourceIdentifier.builder().id("id") },
+                new Object[] { "key", StoreResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetCountriesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetCountriesActionTest.java
index ebb20bdc35a..47c1f5ae100 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetCountriesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetCountriesActionTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreSetCountriesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreSetCountriesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreSetCountriesActionBuilder builder) {
         StoreSetCountriesAction storeSetCountriesAction = builder.buildUnchecked();
         Assertions.assertThat(storeSetCountriesAction).isInstanceOf(StoreSetCountriesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreSetCountriesAction.builder()
+        return new Object[][] { new Object[] { "countries", StoreSetCountriesAction.builder()
                 .countries(
                     Collections.singletonList(new com.commercetools.api.models.store_country.StoreCountryImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetCustomFieldActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetCustomFieldActionTest.java
index b6bca26247a..b1d8ccdabba 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetCustomFieldActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetCustomFieldActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreSetCustomFieldActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreSetCustomFieldActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreSetCustomFieldActionBuilder builder) {
         StoreSetCustomFieldAction storeSetCustomFieldAction = builder.buildUnchecked();
         Assertions.assertThat(storeSetCustomFieldAction).isInstanceOf(StoreSetCustomFieldAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreSetCustomFieldAction.builder().name("name") },
-                new Object[] { StoreSetCustomFieldAction.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", StoreSetCustomFieldAction.builder().name("name") },
+                new Object[] { "value", StoreSetCustomFieldAction.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetCustomTypeActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetCustomTypeActionTest.java
index 3639735dc24..67bc7fdb1b2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetCustomTypeActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetCustomTypeActionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreSetCustomTypeActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreSetCustomTypeActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreSetCustomTypeActionBuilder builder) {
         StoreSetCustomTypeAction storeSetCustomTypeAction = builder.buildUnchecked();
         Assertions.assertThat(storeSetCustomTypeAction).isInstanceOf(StoreSetCustomTypeAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { StoreSetCustomTypeAction.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { StoreSetCustomTypeAction.builder()
+                new Object[] { "type",
+                        StoreSetCustomTypeAction.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", StoreSetCustomTypeAction.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetDistributionChannelsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetDistributionChannelsActionTest.java
index 6b7d515d9b7..6157afd47d5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetDistributionChannelsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetDistributionChannelsActionTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreSetDistributionChannelsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreSetDistributionChannelsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreSetDistributionChannelsActionBuilder builder) {
         StoreSetDistributionChannelsAction storeSetDistributionChannelsAction = builder.buildUnchecked();
         Assertions.assertThat(storeSetDistributionChannelsAction)
                 .isInstanceOf(StoreSetDistributionChannelsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreSetDistributionChannelsAction.builder()
-                .distributionChannels(Collections
-                        .singletonList(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl())) } };
+        return new Object[][] { new Object[] { "distributionChannels",
+                StoreSetDistributionChannelsAction.builder()
+                        .distributionChannels(Collections.singletonList(
+                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetLanguagesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetLanguagesActionTest.java
index 28a819b1757..fba2c086100 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetLanguagesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetLanguagesActionTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreSetLanguagesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreSetLanguagesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreSetLanguagesActionBuilder builder) {
         StoreSetLanguagesAction storeSetLanguagesAction = builder.buildUnchecked();
         Assertions.assertThat(storeSetLanguagesAction).isInstanceOf(StoreSetLanguagesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { StoreSetLanguagesAction.builder().languages(Collections.singletonList("languages")) } };
+        return new Object[][] { new Object[] { "languages",
+                StoreSetLanguagesAction.builder().languages(Collections.singletonList("languages")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetNameActionTest.java
index f7c9d61a337..24e1ea5b6de 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.store;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreSetNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreSetNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreSetNameActionBuilder builder) {
         StoreSetNameAction storeSetNameAction = builder.buildUnchecked();
         Assertions.assertThat(storeSetNameAction).isInstanceOf(StoreSetNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "name",
                 StoreSetNameAction.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetProductSelectionsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetProductSelectionsActionTest.java
index ecef1e9172d..6a80b94419c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetProductSelectionsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetProductSelectionsActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreSetProductSelectionsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreSetProductSelectionsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreSetProductSelectionsActionBuilder builder) {
         StoreSetProductSelectionsAction storeSetProductSelectionsAction = builder.buildUnchecked();
         Assertions.assertThat(storeSetProductSelectionsAction).isInstanceOf(StoreSetProductSelectionsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreSetProductSelectionsAction.builder()
-                .productSelections(Collections
-                        .singletonList(new com.commercetools.api.models.store.ProductSelectionSettingDraftImpl())) } };
+        return new Object[][] { new Object[] { "productSelections",
+                StoreSetProductSelectionsAction.builder()
+                        .productSelections(Collections.singletonList(
+                            new com.commercetools.api.models.store.ProductSelectionSettingDraftImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetSupplyChannelsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetSupplyChannelsActionTest.java
index 2835ce3535d..e3b69b26b27 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetSupplyChannelsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreSetSupplyChannelsActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreSetSupplyChannelsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreSetSupplyChannelsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreSetSupplyChannelsActionBuilder builder) {
         StoreSetSupplyChannelsAction storeSetSupplyChannelsAction = builder.buildUnchecked();
         Assertions.assertThat(storeSetSupplyChannelsAction).isInstanceOf(StoreSetSupplyChannelsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreSetSupplyChannelsAction.builder()
-                .supplyChannels(Collections
-                        .singletonList(new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl())) } };
+        return new Object[][] { new Object[] { "supplyChannels",
+                StoreSetSupplyChannelsAction.builder()
+                        .supplyChannels(Collections.singletonList(
+                            new com.commercetools.api.models.channel.ChannelResourceIdentifierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreTest.java
index 8b46de0dab0..adfad1f9107 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreTest.java
@@ -4,51 +4,52 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreBuilder builder) {
         Store store = builder.buildUnchecked();
         Assertions.assertThat(store).isInstanceOf(Store.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Store.builder().id("id") }, new Object[] { Store.builder().version(2L) },
-                new Object[] { Store.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Store.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Store.builder().id("id") },
+                new Object[] { "version", Store.builder().version(2L) },
+                new Object[] { "createdAt", Store.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Store.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
                         Store.builder().lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Store.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { Store.builder().key("key") },
-                new Object[] { Store.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { Store.builder().languages(Collections.singletonList("languages")) },
-                new Object[] { Store.builder()
-                        .countries(Collections
-                                .singletonList(new com.commercetools.api.models.store_country.StoreCountryImpl())) },
-                new Object[] { Store.builder()
-                        .distributionChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
-                new Object[] { Store.builder()
-                        .supplyChannels(Collections
-                                .singletonList(new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
-                new Object[] { Store.builder()
-                        .productSelections(Collections
-                                .singletonList(new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
-                new Object[] { Store.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
+                new Object[] { "createdBy",
+                        Store.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
+                new Object[] { "key", Store.builder().key("key") },
+                new Object[] { "name",
+                        Store.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "languages", Store.builder().languages(Collections.singletonList("languages")) },
+                new Object[] { "countries",
+                        Store.builder()
+                                .countries(Collections.singletonList(
+                                    new com.commercetools.api.models.store_country.StoreCountryImpl())) },
+                new Object[] { "distributionChannels",
+                        Store.builder()
+                                .distributionChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
+                new Object[] { "supplyChannels",
+                        Store.builder()
+                                .supplyChannels(Collections.singletonList(
+                                    new com.commercetools.api.models.channel.ChannelReferenceImpl())) },
+                new Object[] { "productSelections",
+                        Store.builder()
+                                .productSelections(Collections.singletonList(
+                                    new com.commercetools.api.models.store.ProductSelectionSettingImpl())) },
+                new Object[] { "custom",
+                        Store.builder().custom(new com.commercetools.api.models.type.CustomFieldsImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreUpdateTest.java
index 9a94cce9ef8..83ed485d0bf 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store/StoreUpdateTest.java
@@ -3,31 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreUpdateBuilder builder) {
         StoreUpdate storeUpdate = builder.buildUnchecked();
         Assertions.assertThat(storeUpdate).isInstanceOf(StoreUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreUpdate.builder().version(2L) }, new Object[] { StoreUpdate.builder()
-                .actions(Collections.singletonList(new com.commercetools.api.models.store.StoreUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", StoreUpdate.builder().version(2L) }, new Object[] { "actions",
+                StoreUpdate.builder()
+                        .actions(Collections
+                                .singletonList(new com.commercetools.api.models.store.StoreUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store_country/StoreCountryTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store_country/StoreCountryTest.java
index 2c39eaa149f..ca3ac64d4e3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store_country/StoreCountryTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/store_country/StoreCountryTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.store_country;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreCountryTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreCountryBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreCountryBuilder builder) {
         StoreCountry storeCountry = builder.buildUnchecked();
         Assertions.assertThat(storeCountry).isInstanceOf(StoreCountry.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreCountry.builder().code("code") } };
+        return new Object[][] { new Object[] { "code", StoreCountry.builder().code("code") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/AzureEventGridDestinationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/AzureEventGridDestinationTest.java
index 10d1240ac0e..02282bbd102 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/AzureEventGridDestinationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/AzureEventGridDestinationTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AzureEventGridDestinationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AzureEventGridDestinationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AzureEventGridDestinationBuilder builder) {
         AzureEventGridDestination azureEventGridDestination = builder.buildUnchecked();
         Assertions.assertThat(azureEventGridDestination).isInstanceOf(AzureEventGridDestination.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AzureEventGridDestination.builder().uri("uri") },
-                new Object[] { AzureEventGridDestination.builder().accessKey("accessKey") } };
+        return new Object[][] { new Object[] { "uri", AzureEventGridDestination.builder().uri("uri") },
+                new Object[] { "accessKey", AzureEventGridDestination.builder().accessKey("accessKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/AzureServiceBusDestinationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/AzureServiceBusDestinationTest.java
index 6106d1a3c9f..8ea80b91988 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/AzureServiceBusDestinationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/AzureServiceBusDestinationTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AzureServiceBusDestinationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AzureServiceBusDestinationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AzureServiceBusDestinationBuilder builder) {
         AzureServiceBusDestination azureServiceBusDestination = builder.buildUnchecked();
         Assertions.assertThat(azureServiceBusDestination).isInstanceOf(AzureServiceBusDestination.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { AzureServiceBusDestination.builder().connectionString("connectionString") } };
+        return new Object[][] { new Object[] { "connectionString",
+                AzureServiceBusDestination.builder().connectionString("connectionString") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ChangeSubscriptionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ChangeSubscriptionTest.java
index 8cd946f892f..1bc03dd5989 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ChangeSubscriptionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ChangeSubscriptionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeSubscriptionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeSubscriptionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeSubscriptionBuilder builder) {
         ChangeSubscription changeSubscription = builder.buildUnchecked();
         Assertions.assertThat(changeSubscription).isInstanceOf(ChangeSubscription.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeSubscription.builder()
-                .resourceTypeId(com.commercetools.api.models.subscription.ChangeSubscriptionResourceTypeId
-                        .findEnum("approval-flow")) } };
+        return new Object[][] { new Object[] { "resourceTypeId",
+                ChangeSubscription.builder()
+                        .resourceTypeId(com.commercetools.api.models.subscription.ChangeSubscriptionResourceTypeId
+                                .findEnum("approval-flow")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/CloudEventsFormatTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/CloudEventsFormatTest.java
index 530d2e181e3..e0bdb69b08f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/CloudEventsFormatTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/CloudEventsFormatTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CloudEventsFormatTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CloudEventsFormatBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CloudEventsFormatBuilder builder) {
         CloudEventsFormat cloudEventsFormat = builder.buildUnchecked();
         Assertions.assertThat(cloudEventsFormat).isInstanceOf(CloudEventsFormat.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CloudEventsFormat.builder().cloudEventsVersion("cloudEventsVersion") } };
+        return new Object[][] { new Object[] { "cloudEventsVersion",
+                CloudEventsFormat.builder().cloudEventsVersion("cloudEventsVersion") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/CloudEventsPayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/CloudEventsPayloadTest.java
index ac11a4dd39f..52a817bd5e1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/CloudEventsPayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/CloudEventsPayloadTest.java
@@ -3,39 +3,31 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CloudEventsPayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CloudEventsPayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CloudEventsPayloadBuilder builder) {
         CloudEventsPayload cloudEventsPayload = builder.buildUnchecked();
         Assertions.assertThat(cloudEventsPayload).isInstanceOf(CloudEventsPayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CloudEventsPayload.builder().specversion("specversion") },
-                new Object[] { CloudEventsPayload.builder().id("id") },
-                new Object[] { CloudEventsPayload.builder().type("type") },
-                new Object[] { CloudEventsPayload.builder().source("source") },
-                new Object[] { CloudEventsPayload.builder().subject("subject") },
-                new Object[] { CloudEventsPayload.builder().time(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { CloudEventsPayload.builder().sequence("sequence") },
-                new Object[] { CloudEventsPayload.builder().sequencetype("sequencetype") },
-                new Object[] { CloudEventsPayload.builder().dataref("dataref") },
-                new Object[] { CloudEventsPayload.builder()
+        return new Object[][] { new Object[] { "specversion", CloudEventsPayload.builder().specversion("specversion") },
+                new Object[] { "id", CloudEventsPayload.builder().id("id") },
+                new Object[] { "type", CloudEventsPayload.builder().type("type") },
+                new Object[] { "source", CloudEventsPayload.builder().source("source") },
+                new Object[] { "subject", CloudEventsPayload.builder().subject("subject") },
+                new Object[] { "time", CloudEventsPayload.builder().time(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "sequence", CloudEventsPayload.builder().sequence("sequence") },
+                new Object[] { "sequencetype", CloudEventsPayload.builder().sequencetype("sequencetype") },
+                new Object[] { "dataref", CloudEventsPayload.builder().dataref("dataref") },
+                new Object[] { "data", CloudEventsPayload.builder()
                         .data(new com.commercetools.api.models.subscription.DeliveryPayloadImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ConfluentCloudDestinationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ConfluentCloudDestinationTest.java
index fdded63765e..6559db99db5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ConfluentCloudDestinationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ConfluentCloudDestinationTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ConfluentCloudDestinationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ConfluentCloudDestinationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ConfluentCloudDestinationBuilder builder) {
         ConfluentCloudDestination confluentCloudDestination = builder.buildUnchecked();
         Assertions.assertThat(confluentCloudDestination).isInstanceOf(ConfluentCloudDestination.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ConfluentCloudDestination.builder().bootstrapServer("bootstrapServer") },
-                new Object[] { ConfluentCloudDestination.builder().apiKey("apiKey") },
-                new Object[] { ConfluentCloudDestination.builder().apiSecret("apiSecret") },
-                new Object[] { ConfluentCloudDestination.builder().acks("acks") },
-                new Object[] { ConfluentCloudDestination.builder().topic("topic") },
-                new Object[] { ConfluentCloudDestination.builder().key("key") } };
+        return new Object[][] {
+                new Object[] { "bootstrapServer",
+                        ConfluentCloudDestination.builder().bootstrapServer("bootstrapServer") },
+                new Object[] { "apiKey", ConfluentCloudDestination.builder().apiKey("apiKey") },
+                new Object[] { "apiSecret", ConfluentCloudDestination.builder().apiSecret("apiSecret") },
+                new Object[] { "acks", ConfluentCloudDestination.builder().acks("acks") },
+                new Object[] { "topic", ConfluentCloudDestination.builder().topic("topic") },
+                new Object[] { "key", ConfluentCloudDestination.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/EventBridgeDestinationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/EventBridgeDestinationTest.java
index b842bc3c60e..0acbcbc2f7d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/EventBridgeDestinationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/EventBridgeDestinationTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EventBridgeDestinationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EventBridgeDestinationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EventBridgeDestinationBuilder builder) {
         EventBridgeDestination eventBridgeDestination = builder.buildUnchecked();
         Assertions.assertThat(eventBridgeDestination).isInstanceOf(EventBridgeDestination.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EventBridgeDestination.builder().region("region") },
-                new Object[] { EventBridgeDestination.builder().accountId("accountId") },
-                new Object[] { EventBridgeDestination.builder().source("source") } };
+        return new Object[][] { new Object[] { "region", EventBridgeDestination.builder().region("region") },
+                new Object[] { "accountId", EventBridgeDestination.builder().accountId("accountId") },
+                new Object[] { "source", EventBridgeDestination.builder().source("source") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/EventDeliveryPayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/EventDeliveryPayloadTest.java
index 82c730442b3..cb7b48aa3d5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/EventDeliveryPayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/EventDeliveryPayloadTest.java
@@ -3,35 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EventDeliveryPayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EventDeliveryPayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EventDeliveryPayloadBuilder builder) {
         EventDeliveryPayload eventDeliveryPayload = builder.buildUnchecked();
         Assertions.assertThat(eventDeliveryPayload).isInstanceOf(EventDeliveryPayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EventDeliveryPayload.builder().id("id") },
-                new Object[] { EventDeliveryPayload.builder()
+        return new Object[][] { new Object[] { "id", EventDeliveryPayload.builder().id("id") }, new Object[] { "type",
+                EventDeliveryPayload.builder()
                         .type(com.commercetools.api.models.subscription.EventType.findEnum("ImportContainerCreated")) },
-                new Object[] { EventDeliveryPayload.builder().resourceType("resourceType") },
-                new Object[] { EventDeliveryPayload.builder().data("data") },
-                new Object[] { EventDeliveryPayload.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "resourceType", EventDeliveryPayload.builder().resourceType("resourceType") },
+                new Object[] { "data", EventDeliveryPayload.builder().data("data") }, new Object[] { "createdAt",
+                        EventDeliveryPayload.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/EventSubscriptionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/EventSubscriptionTest.java
index fa2c6e0d578..d01260133af 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/EventSubscriptionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/EventSubscriptionTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EventSubscriptionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EventSubscriptionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EventSubscriptionBuilder builder) {
         EventSubscription eventSubscription = builder.buildUnchecked();
         Assertions.assertThat(eventSubscription).isInstanceOf(EventSubscription.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { EventSubscription.builder()
+                new Object[] { "resourceTypeId", EventSubscription.builder()
                         .resourceTypeId(com.commercetools.api.models.subscription.EventSubscriptionResourceTypeId
                                 .findEnum("import-api")) },
-                new Object[] { EventSubscription.builder()
-                        .types(Collections.singletonList(com.commercetools.api.models.subscription.EventType
-                                .findEnum("ImportContainerCreated"))) } };
+                new Object[] { "types",
+                        EventSubscription.builder()
+                                .types(Collections.singletonList(com.commercetools.api.models.subscription.EventType
+                                        .findEnum("ImportContainerCreated"))) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/GoogleCloudPubSubDestinationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/GoogleCloudPubSubDestinationTest.java
index 918f3ea9c6a..7fb497a0c73 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/GoogleCloudPubSubDestinationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/GoogleCloudPubSubDestinationTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GoogleCloudPubSubDestinationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GoogleCloudPubSubDestinationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GoogleCloudPubSubDestinationBuilder builder) {
         GoogleCloudPubSubDestination googleCloudPubSubDestination = builder.buildUnchecked();
         Assertions.assertThat(googleCloudPubSubDestination).isInstanceOf(GoogleCloudPubSubDestination.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GoogleCloudPubSubDestination.builder().projectId("projectId") },
-                new Object[] { GoogleCloudPubSubDestination.builder().topic("topic") } };
+        return new Object[][] {
+                new Object[] { "projectId", GoogleCloudPubSubDestination.builder().projectId("projectId") },
+                new Object[] { "topic", GoogleCloudPubSubDestination.builder().topic("topic") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/MessageDeliveryPayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/MessageDeliveryPayloadTest.java
index 380b364b560..40f86a0a45a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/MessageDeliveryPayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/MessageDeliveryPayloadTest.java
@@ -3,37 +3,30 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MessageDeliveryPayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MessageDeliveryPayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MessageDeliveryPayloadBuilder builder) {
         MessageDeliveryPayload messageDeliveryPayload = builder.buildUnchecked();
         Assertions.assertThat(messageDeliveryPayload).isInstanceOf(MessageDeliveryPayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MessageDeliveryPayload.builder().id("id") },
-                new Object[] { MessageDeliveryPayload.builder().version(2L) },
-                new Object[] { MessageDeliveryPayload.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", MessageDeliveryPayload.builder().id("id") },
+                new Object[] { "version", MessageDeliveryPayload.builder().version(2L) },
+                new Object[] { "createdAt",
+                        MessageDeliveryPayload.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
                         MessageDeliveryPayload.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { MessageDeliveryPayload.builder().sequenceNumber(2L) },
-                new Object[] { MessageDeliveryPayload.builder().resourceVersion(9L) },
-                new Object[] { MessageDeliveryPayload.builder()
+                new Object[] { "sequenceNumber", MessageDeliveryPayload.builder().sequenceNumber(2L) },
+                new Object[] { "resourceVersion", MessageDeliveryPayload.builder().resourceVersion(9L) },
+                new Object[] { "payloadNotIncluded", MessageDeliveryPayload.builder()
                         .payloadNotIncluded(new com.commercetools.api.models.subscription.PayloadNotIncludedImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/MessageSubscriptionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/MessageSubscriptionTest.java
index 65ddf1b172f..d946bb268ba 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/MessageSubscriptionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/MessageSubscriptionTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MessageSubscriptionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MessageSubscriptionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MessageSubscriptionBuilder builder) {
         MessageSubscription messageSubscription = builder.buildUnchecked();
         Assertions.assertThat(messageSubscription).isInstanceOf(MessageSubscription.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { MessageSubscription.builder()
+                new Object[] { "resourceTypeId", MessageSubscription.builder()
                         .resourceTypeId(com.commercetools.api.models.subscription.MessageSubscriptionResourceTypeId
                                 .findEnum("approval-flow")) },
-                new Object[] { MessageSubscription.builder().types(Collections.singletonList("types")) } };
+                new Object[] { "types", MessageSubscription.builder().types(Collections.singletonList("types")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/PayloadNotIncludedTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/PayloadNotIncludedTest.java
index b2e5cf28be1..a50befb54e7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/PayloadNotIncludedTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/PayloadNotIncludedTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PayloadNotIncludedTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PayloadNotIncludedBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PayloadNotIncludedBuilder builder) {
         PayloadNotIncluded payloadNotIncluded = builder.buildUnchecked();
         Assertions.assertThat(payloadNotIncluded).isInstanceOf(PayloadNotIncluded.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PayloadNotIncluded.builder().reason("reason") },
-                new Object[] { PayloadNotIncluded.builder().payloadType("payloadType") } };
+        return new Object[][] { new Object[] { "reason", PayloadNotIncluded.builder().reason("reason") },
+                new Object[] { "payloadType", PayloadNotIncluded.builder().payloadType("payloadType") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/PlatformFormatTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/PlatformFormatTest.java
index 864294b7f14..3c0c3531a09 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/PlatformFormatTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/PlatformFormatTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PlatformFormatTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ResourceCreatedDeliveryPayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ResourceCreatedDeliveryPayloadTest.java
index 319a7c35434..52fb4a50500 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ResourceCreatedDeliveryPayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ResourceCreatedDeliveryPayloadTest.java
@@ -3,31 +3,24 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ResourceCreatedDeliveryPayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ResourceCreatedDeliveryPayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ResourceCreatedDeliveryPayloadBuilder builder) {
         ResourceCreatedDeliveryPayload resourceCreatedDeliveryPayload = builder.buildUnchecked();
         Assertions.assertThat(resourceCreatedDeliveryPayload).isInstanceOf(ResourceCreatedDeliveryPayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ResourceCreatedDeliveryPayload.builder().version(2L) }, new Object[] {
-                ResourceCreatedDeliveryPayload.builder().modifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+        return new Object[][] { new Object[] { "version", ResourceCreatedDeliveryPayload.builder().version(2L) },
+                new Object[] { "modifiedAt", ResourceCreatedDeliveryPayload.builder()
+                        .modifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ResourceDeletedDeliveryPayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ResourceDeletedDeliveryPayloadTest.java
index 72b5cbe652b..e32b6e3f8b5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ResourceDeletedDeliveryPayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ResourceDeletedDeliveryPayloadTest.java
@@ -3,33 +3,25 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ResourceDeletedDeliveryPayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ResourceDeletedDeliveryPayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ResourceDeletedDeliveryPayloadBuilder builder) {
         ResourceDeletedDeliveryPayload resourceDeletedDeliveryPayload = builder.buildUnchecked();
         Assertions.assertThat(resourceDeletedDeliveryPayload).isInstanceOf(ResourceDeletedDeliveryPayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ResourceDeletedDeliveryPayload.builder().version(2L) },
-                new Object[] {
+        return new Object[][] { new Object[] { "version", ResourceDeletedDeliveryPayload.builder().version(2L) },
+                new Object[] { "modifiedAt",
                         ResourceDeletedDeliveryPayload.builder().modifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ResourceDeletedDeliveryPayload.builder().dataErasure(true) } };
+                new Object[] { "dataErasure", ResourceDeletedDeliveryPayload.builder().dataErasure(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ResourceUpdatedDeliveryPayloadTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ResourceUpdatedDeliveryPayloadTest.java
index 6246502114b..f9cc785b5fa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ResourceUpdatedDeliveryPayloadTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/ResourceUpdatedDeliveryPayloadTest.java
@@ -3,32 +3,24 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ResourceUpdatedDeliveryPayloadTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ResourceUpdatedDeliveryPayloadBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ResourceUpdatedDeliveryPayloadBuilder builder) {
         ResourceUpdatedDeliveryPayload resourceUpdatedDeliveryPayload = builder.buildUnchecked();
         Assertions.assertThat(resourceUpdatedDeliveryPayload).isInstanceOf(ResourceUpdatedDeliveryPayload.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ResourceUpdatedDeliveryPayload.builder().version(2L) },
-                new Object[] { ResourceUpdatedDeliveryPayload.builder().oldVersion(3L) },
-                new Object[] { ResourceUpdatedDeliveryPayload.builder()
+        return new Object[][] { new Object[] { "version", ResourceUpdatedDeliveryPayload.builder().version(2L) },
+                new Object[] { "oldVersion", ResourceUpdatedDeliveryPayload.builder().oldVersion(3L) },
+                new Object[] { "modifiedAt", ResourceUpdatedDeliveryPayload.builder()
                         .modifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SnsDestinationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SnsDestinationTest.java
index 6c8f01e3291..0f5f2b8612f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SnsDestinationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SnsDestinationTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SnsDestinationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SnsDestinationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SnsDestinationBuilder builder) {
         SnsDestination snsDestination = builder.buildUnchecked();
         Assertions.assertThat(snsDestination).isInstanceOf(SnsDestination.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SnsDestination.builder().accessKey("accessKey") },
-                new Object[] { SnsDestination.builder().accessSecret("accessSecret") },
-                new Object[] { SnsDestination.builder().topicArn("topicArn") },
-                new Object[] { SnsDestination.builder()
-                        .authenticationMode(com.commercetools.api.models.subscription.AwsAuthenticationMode
-                                .findEnum("Credentials")) } };
+        return new Object[][] { new Object[] { "accessKey", SnsDestination.builder().accessKey("accessKey") },
+                new Object[] { "accessSecret", SnsDestination.builder().accessSecret("accessSecret") },
+                new Object[] { "topicArn", SnsDestination.builder().topicArn("topicArn") },
+                new Object[] { "authenticationMode",
+                        SnsDestination.builder()
+                                .authenticationMode(com.commercetools.api.models.subscription.AwsAuthenticationMode
+                                        .findEnum("Credentials")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SqsDestinationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SqsDestinationTest.java
index 2b3246338e0..dc78270bb15 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SqsDestinationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SqsDestinationTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SqsDestinationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SqsDestinationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SqsDestinationBuilder builder) {
         SqsDestination sqsDestination = builder.buildUnchecked();
         Assertions.assertThat(sqsDestination).isInstanceOf(SqsDestination.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SqsDestination.builder().accessKey("accessKey") },
-                new Object[] { SqsDestination.builder().accessSecret("accessSecret") },
-                new Object[] { SqsDestination.builder().queueUrl("queueUrl") },
-                new Object[] { SqsDestination.builder().region("region") },
-                new Object[] { SqsDestination.builder()
-                        .authenticationMode(com.commercetools.api.models.subscription.AwsAuthenticationMode
-                                .findEnum("Credentials")) } };
+        return new Object[][] { new Object[] { "accessKey", SqsDestination.builder().accessKey("accessKey") },
+                new Object[] { "accessSecret", SqsDestination.builder().accessSecret("accessSecret") },
+                new Object[] { "queueUrl", SqsDestination.builder().queueUrl("queueUrl") },
+                new Object[] { "region", SqsDestination.builder().region("region") },
+                new Object[] { "authenticationMode",
+                        SqsDestination.builder()
+                                .authenticationMode(com.commercetools.api.models.subscription.AwsAuthenticationMode
+                                        .findEnum("Credentials")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionChangeDestinationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionChangeDestinationActionTest.java
index da5ea73e1b1..1c3e4c5df83 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionChangeDestinationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionChangeDestinationActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SubscriptionChangeDestinationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SubscriptionChangeDestinationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SubscriptionChangeDestinationActionBuilder builder) {
         SubscriptionChangeDestinationAction subscriptionChangeDestinationAction = builder.buildUnchecked();
         Assertions.assertThat(subscriptionChangeDestinationAction)
                 .isInstanceOf(SubscriptionChangeDestinationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SubscriptionChangeDestinationAction.builder()
+        return new Object[][] { new Object[] { "destination", SubscriptionChangeDestinationAction.builder()
                 .destination(new com.commercetools.api.models.subscription.DestinationImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionDraftTest.java
index 8b440862bdf..0347108d4e6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionDraftTest.java
@@ -3,43 +3,39 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SubscriptionDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SubscriptionDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SubscriptionDraftBuilder builder) {
         SubscriptionDraft subscriptionDraft = builder.buildUnchecked();
         Assertions.assertThat(subscriptionDraft).isInstanceOf(SubscriptionDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { SubscriptionDraft.builder()
-                        .changes(Collections.singletonList(
-                            new com.commercetools.api.models.subscription.ChangeSubscriptionImpl())) },
-                new Object[] { SubscriptionDraft.builder()
-                        .destination(new com.commercetools.api.models.subscription.DestinationImpl()) },
-                new Object[] { SubscriptionDraft.builder().key("key") },
-                new Object[] { SubscriptionDraft.builder()
-                        .messages(Collections.singletonList(
-                            new com.commercetools.api.models.subscription.MessageSubscriptionImpl())) },
-                new Object[] { SubscriptionDraft.builder()
-                        .events(Collections.singletonList(
-                            new com.commercetools.api.models.subscription.EventSubscriptionImpl())) },
-                new Object[] { SubscriptionDraft.builder()
+                new Object[] { "changes",
+                        SubscriptionDraft.builder()
+                                .changes(Collections.singletonList(
+                                    new com.commercetools.api.models.subscription.ChangeSubscriptionImpl())) },
+                new Object[] { "destination",
+                        SubscriptionDraft.builder()
+                                .destination(new com.commercetools.api.models.subscription.DestinationImpl()) },
+                new Object[] { "key", SubscriptionDraft.builder().key("key") },
+                new Object[] { "messages",
+                        SubscriptionDraft.builder()
+                                .messages(Collections.singletonList(
+                                    new com.commercetools.api.models.subscription.MessageSubscriptionImpl())) },
+                new Object[] { "events",
+                        SubscriptionDraft.builder()
+                                .events(Collections.singletonList(
+                                    new com.commercetools.api.models.subscription.EventSubscriptionImpl())) },
+                new Object[] { "format", SubscriptionDraft.builder()
                         .format(new com.commercetools.api.models.subscription.DeliveryFormatImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionPagedQueryResponseTest.java
index 3040b39e01c..d9c50aeea7c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SubscriptionPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SubscriptionPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SubscriptionPagedQueryResponseBuilder builder) {
         SubscriptionPagedQueryResponse subscriptionPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(subscriptionPagedQueryResponse).isInstanceOf(SubscriptionPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SubscriptionPagedQueryResponse.builder().limit(7L) },
-                new Object[] { SubscriptionPagedQueryResponse.builder().offset(3L) },
-                new Object[] { SubscriptionPagedQueryResponse.builder().count(2L) },
-                new Object[] { SubscriptionPagedQueryResponse.builder().total(1L) },
-                new Object[] { SubscriptionPagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.subscription.SubscriptionImpl())) } };
+        return new Object[][] { new Object[] { "limit", SubscriptionPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", SubscriptionPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", SubscriptionPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", SubscriptionPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        SubscriptionPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.subscription.SubscriptionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetChangesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetChangesActionTest.java
index 153087158dc..bb3746b0b5a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetChangesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetChangesActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SubscriptionSetChangesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SubscriptionSetChangesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SubscriptionSetChangesActionBuilder builder) {
         SubscriptionSetChangesAction subscriptionSetChangesAction = builder.buildUnchecked();
         Assertions.assertThat(subscriptionSetChangesAction).isInstanceOf(SubscriptionSetChangesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SubscriptionSetChangesAction.builder()
-                .changes(Collections
-                        .singletonList(new com.commercetools.api.models.subscription.ChangeSubscriptionImpl())) } };
+        return new Object[][] { new Object[] { "changes",
+                SubscriptionSetChangesAction.builder()
+                        .changes(Collections.singletonList(
+                            new com.commercetools.api.models.subscription.ChangeSubscriptionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetEventsActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetEventsActionTest.java
index 6949e8c05b9..aa0ceb866d2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetEventsActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetEventsActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SubscriptionSetEventsActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SubscriptionSetEventsActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SubscriptionSetEventsActionBuilder builder) {
         SubscriptionSetEventsAction subscriptionSetEventsAction = builder.buildUnchecked();
         Assertions.assertThat(subscriptionSetEventsAction).isInstanceOf(SubscriptionSetEventsAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SubscriptionSetEventsAction.builder()
-                .messages(Collections
-                        .singletonList(new com.commercetools.api.models.subscription.EventSubscriptionImpl())) } };
+        return new Object[][] { new Object[] { "messages",
+                SubscriptionSetEventsAction.builder()
+                        .messages(Collections.singletonList(
+                            new com.commercetools.api.models.subscription.EventSubscriptionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetKeyActionTest.java
index 196fc6a792f..39aad4b899a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.subscription;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SubscriptionSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SubscriptionSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SubscriptionSetKeyActionBuilder builder) {
         SubscriptionSetKeyAction subscriptionSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(subscriptionSetKeyAction).isInstanceOf(SubscriptionSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SubscriptionSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", SubscriptionSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetMessagesActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetMessagesActionTest.java
index b5d8606c414..1af0bd70ec6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetMessagesActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionSetMessagesActionTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SubscriptionSetMessagesActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SubscriptionSetMessagesActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SubscriptionSetMessagesActionBuilder builder) {
         SubscriptionSetMessagesAction subscriptionSetMessagesAction = builder.buildUnchecked();
         Assertions.assertThat(subscriptionSetMessagesAction).isInstanceOf(SubscriptionSetMessagesAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SubscriptionSetMessagesAction.builder()
-                .messages(Collections
-                        .singletonList(new com.commercetools.api.models.subscription.MessageSubscriptionImpl())) } };
+        return new Object[][] { new Object[] { "messages",
+                SubscriptionSetMessagesAction.builder()
+                        .messages(Collections.singletonList(
+                            new com.commercetools.api.models.subscription.MessageSubscriptionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionTest.java
index e89f9031f78..07ddfbff7cd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionTest.java
@@ -4,52 +4,52 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SubscriptionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SubscriptionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SubscriptionBuilder builder) {
         Subscription subscription = builder.buildUnchecked();
         Assertions.assertThat(subscription).isInstanceOf(Subscription.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Subscription.builder().id("id") },
-                new Object[] { Subscription.builder().version(2L) },
-                new Object[] { Subscription.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Subscription.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Subscription.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Subscription.builder().id("id") },
+                new Object[] { "version", Subscription.builder().version(2L) },
+                new Object[] { "createdAt",
+                        Subscription.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Subscription.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        Subscription.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         Subscription.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { Subscription.builder()
-                        .changes(Collections.singletonList(
-                            new com.commercetools.api.models.subscription.ChangeSubscriptionImpl())) },
-                new Object[] { Subscription.builder()
-                        .destination(new com.commercetools.api.models.subscription.DestinationImpl()) },
-                new Object[] { Subscription.builder().key("key") },
-                new Object[] { Subscription.builder()
-                        .messages(Collections.singletonList(
-                            new com.commercetools.api.models.subscription.MessageSubscriptionImpl())) },
-                new Object[] { Subscription.builder()
-                        .events(Collections.singletonList(
-                            new com.commercetools.api.models.subscription.EventSubscriptionImpl())) },
-                new Object[] { Subscription.builder()
-                        .format(new com.commercetools.api.models.subscription.DeliveryFormatImpl()) },
-                new Object[] { Subscription.builder()
+                new Object[] { "changes",
+                        Subscription.builder()
+                                .changes(Collections.singletonList(
+                                    new com.commercetools.api.models.subscription.ChangeSubscriptionImpl())) },
+                new Object[] { "destination",
+                        Subscription.builder()
+                                .destination(new com.commercetools.api.models.subscription.DestinationImpl()) },
+                new Object[] { "key", Subscription.builder().key("key") },
+                new Object[] { "messages",
+                        Subscription.builder()
+                                .messages(Collections.singletonList(
+                                    new com.commercetools.api.models.subscription.MessageSubscriptionImpl())) },
+                new Object[] { "events",
+                        Subscription.builder()
+                                .events(Collections.singletonList(
+                                    new com.commercetools.api.models.subscription.EventSubscriptionImpl())) },
+                new Object[] { "format",
+                        Subscription.builder()
+                                .format(new com.commercetools.api.models.subscription.DeliveryFormatImpl()) },
+                new Object[] { "status", Subscription.builder()
                         .status(
                             com.commercetools.api.models.subscription.SubscriptionHealthStatus.findEnum("Healthy")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionUpdateTest.java
index 88310744f0b..6545f7d83c4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/subscription/SubscriptionUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SubscriptionUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SubscriptionUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SubscriptionUpdateBuilder builder) {
         SubscriptionUpdate subscriptionUpdate = builder.buildUnchecked();
         Assertions.assertThat(subscriptionUpdate).isInstanceOf(SubscriptionUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SubscriptionUpdate.builder().version(2L) },
-                new Object[] { SubscriptionUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.subscription.SubscriptionUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", SubscriptionUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        SubscriptionUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.subscription.SubscriptionUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/SubRateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/SubRateTest.java
index f02a2638858..e2ca77d5ad9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/SubRateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/SubRateTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.tax_category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SubRateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SubRateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SubRateBuilder builder) {
         SubRate subRate = builder.buildUnchecked();
         Assertions.assertThat(subRate).isInstanceOf(SubRate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SubRate.builder().name("name") },
-                new Object[] { SubRate.builder().amount(0.43789625) } };
+        return new Object[][] { new Object[] { "name", SubRate.builder().name("name") },
+                new Object[] { "amount", SubRate.builder().amount(0.43789625) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryAddTaxRateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryAddTaxRateActionTest.java
index 445c1a1c8bc..88057e26dd9 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryAddTaxRateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryAddTaxRateActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.tax_category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategoryAddTaxRateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxCategoryAddTaxRateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxCategoryAddTaxRateActionBuilder builder) {
         TaxCategoryAddTaxRateAction taxCategoryAddTaxRateAction = builder.buildUnchecked();
         Assertions.assertThat(taxCategoryAddTaxRateAction).isInstanceOf(TaxCategoryAddTaxRateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxCategoryAddTaxRateAction.builder()
+        return new Object[][] { new Object[] { "taxRate", TaxCategoryAddTaxRateAction.builder()
                 .taxRate(new com.commercetools.api.models.tax_category.TaxRateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryChangeNameActionTest.java
index b47949af945..e09a48b904f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.tax_category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategoryChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxCategoryChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxCategoryChangeNameActionBuilder builder) {
         TaxCategoryChangeNameAction taxCategoryChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(taxCategoryChangeNameAction).isInstanceOf(TaxCategoryChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxCategoryChangeNameAction.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", TaxCategoryChangeNameAction.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryDraftTest.java
index 57a62e8b190..b6619a5b465 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryDraftTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategoryDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxCategoryDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxCategoryDraftBuilder builder) {
         TaxCategoryDraft taxCategoryDraft = builder.buildUnchecked();
         Assertions.assertThat(taxCategoryDraft).isInstanceOf(TaxCategoryDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxCategoryDraft.builder().name("name") },
-                new Object[] { TaxCategoryDraft.builder().description("description") },
-                new Object[] { TaxCategoryDraft.builder()
-                        .rates(Collections
-                                .singletonList(new com.commercetools.api.models.tax_category.TaxRateDraftImpl())) },
-                new Object[] { TaxCategoryDraft.builder().key("key") } };
+        return new Object[][] { new Object[] { "name", TaxCategoryDraft.builder().name("name") },
+                new Object[] { "description", TaxCategoryDraft.builder().description("description") },
+                new Object[] { "rates",
+                        TaxCategoryDraft.builder()
+                                .rates(Collections.singletonList(
+                                    new com.commercetools.api.models.tax_category.TaxRateDraftImpl())) },
+                new Object[] { "key", TaxCategoryDraft.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryPagedQueryResponseTest.java
index ee7d1d50555..3b856c78afb 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategoryPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxCategoryPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxCategoryPagedQueryResponseBuilder builder) {
         TaxCategoryPagedQueryResponse taxCategoryPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(taxCategoryPagedQueryResponse).isInstanceOf(TaxCategoryPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxCategoryPagedQueryResponse.builder().limit(7L) },
-                new Object[] { TaxCategoryPagedQueryResponse.builder().offset(3L) },
-                new Object[] { TaxCategoryPagedQueryResponse.builder().count(2L) },
-                new Object[] { TaxCategoryPagedQueryResponse.builder().total(1L) },
-                new Object[] { TaxCategoryPagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.api.models.tax_category.TaxCategoryImpl())) } };
+        return new Object[][] { new Object[] { "limit", TaxCategoryPagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", TaxCategoryPagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", TaxCategoryPagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", TaxCategoryPagedQueryResponse.builder().total(1L) },
+                new Object[] { "results",
+                        TaxCategoryPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.api.models.tax_category.TaxCategoryImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryReferenceTest.java
index 3d8c2511046..e7263a1f3da 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryReferenceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.tax_category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategoryReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxCategoryReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxCategoryReferenceBuilder builder) {
         TaxCategoryReference taxCategoryReference = builder.buildUnchecked();
         Assertions.assertThat(taxCategoryReference).isInstanceOf(TaxCategoryReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { TaxCategoryReference.builder()
-                        .obj(new com.commercetools.api.models.tax_category.TaxCategoryImpl()) },
-                new Object[] { TaxCategoryReference.builder().id("id") } };
+                new Object[] { "obj",
+                        TaxCategoryReference.builder()
+                                .obj(new com.commercetools.api.models.tax_category.TaxCategoryImpl()) },
+                new Object[] { "id", TaxCategoryReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryRemoveTaxRateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryRemoveTaxRateActionTest.java
index 6e21592467b..3831555418b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryRemoveTaxRateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryRemoveTaxRateActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.tax_category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategoryRemoveTaxRateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxCategoryRemoveTaxRateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxCategoryRemoveTaxRateActionBuilder builder) {
         TaxCategoryRemoveTaxRateAction taxCategoryRemoveTaxRateAction = builder.buildUnchecked();
         Assertions.assertThat(taxCategoryRemoveTaxRateAction).isInstanceOf(TaxCategoryRemoveTaxRateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxCategoryRemoveTaxRateAction.builder().taxRateId("taxRateId") },
-                new Object[] { TaxCategoryRemoveTaxRateAction.builder().taxRateKey("taxRateKey") } };
+        return new Object[][] {
+                new Object[] { "taxRateId", TaxCategoryRemoveTaxRateAction.builder().taxRateId("taxRateId") },
+                new Object[] { "taxRateKey", TaxCategoryRemoveTaxRateAction.builder().taxRateKey("taxRateKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryReplaceTaxRateActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryReplaceTaxRateActionTest.java
index a4d1c2bdeee..32d5e289487 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryReplaceTaxRateActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryReplaceTaxRateActionTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.tax_category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategoryReplaceTaxRateActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxCategoryReplaceTaxRateActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxCategoryReplaceTaxRateActionBuilder builder) {
         TaxCategoryReplaceTaxRateAction taxCategoryReplaceTaxRateAction = builder.buildUnchecked();
         Assertions.assertThat(taxCategoryReplaceTaxRateAction).isInstanceOf(TaxCategoryReplaceTaxRateAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxCategoryReplaceTaxRateAction.builder().taxRateId("taxRateId") },
-                new Object[] { TaxCategoryReplaceTaxRateAction.builder().taxRateKey("taxRateKey") },
-                new Object[] { TaxCategoryReplaceTaxRateAction.builder()
+        return new Object[][] {
+                new Object[] { "taxRateId", TaxCategoryReplaceTaxRateAction.builder().taxRateId("taxRateId") },
+                new Object[] { "taxRateKey", TaxCategoryReplaceTaxRateAction.builder().taxRateKey("taxRateKey") },
+                new Object[] { "taxRate", TaxCategoryReplaceTaxRateAction.builder()
                         .taxRate(new com.commercetools.api.models.tax_category.TaxRateDraftImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryResourceIdentifierTest.java
index 2a7de989ad0..2ceb69eb119 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.tax_category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategoryResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxCategoryResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxCategoryResourceIdentifierBuilder builder) {
         TaxCategoryResourceIdentifier taxCategoryResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(taxCategoryResourceIdentifier).isInstanceOf(TaxCategoryResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxCategoryResourceIdentifier.builder().id("id") },
-                new Object[] { TaxCategoryResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", TaxCategoryResourceIdentifier.builder().id("id") },
+                new Object[] { "key", TaxCategoryResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategorySetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategorySetDescriptionActionTest.java
index 9a8b37791bf..583612a8056 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategorySetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategorySetDescriptionActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.tax_category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategorySetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxCategorySetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxCategorySetDescriptionActionBuilder builder) {
         TaxCategorySetDescriptionAction taxCategorySetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(taxCategorySetDescriptionAction).isInstanceOf(TaxCategorySetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxCategorySetDescriptionAction.builder().description("description") } };
+        return new Object[][] {
+                new Object[] { "description", TaxCategorySetDescriptionAction.builder().description("description") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategorySetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategorySetKeyActionTest.java
index e9851edbbeb..5d34e902fd4 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategorySetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategorySetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.tax_category;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategorySetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxCategorySetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxCategorySetKeyActionBuilder builder) {
         TaxCategorySetKeyAction taxCategorySetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(taxCategorySetKeyAction).isInstanceOf(TaxCategorySetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxCategorySetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", TaxCategorySetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryTest.java
index ea788cb6648..4240ce1a7aa 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryTest.java
@@ -4,44 +4,38 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategoryTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxCategoryBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxCategoryBuilder builder) {
         TaxCategory taxCategory = builder.buildUnchecked();
         Assertions.assertThat(taxCategory).isInstanceOf(TaxCategory.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxCategory.builder().id("id") },
-                new Object[] { TaxCategory.builder().version(2L) },
-                new Object[] { TaxCategory.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { TaxCategory.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { TaxCategory.builder()
-                        .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", TaxCategory.builder().id("id") },
+                new Object[] { "version", TaxCategory.builder().version(2L) },
+                new Object[] { "createdAt", TaxCategory.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        TaxCategory.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
+                        TaxCategory.builder()
+                                .lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
+                new Object[] { "createdBy",
                         TaxCategory.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { TaxCategory.builder().name("name") },
-                new Object[] { TaxCategory.builder().description("description") },
-                new Object[] {
+                new Object[] { "name", TaxCategory.builder().name("name") },
+                new Object[] { "description", TaxCategory.builder().description("description") },
+                new Object[] { "rates",
                         TaxCategory.builder()
                                 .rates(Collections
                                         .singletonList(new com.commercetools.api.models.tax_category.TaxRateImpl())) },
-                new Object[] { TaxCategory.builder().key("key") } };
+                new Object[] { "key", TaxCategory.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryUpdateTest.java
index 58e587182a8..a261be69768 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxCategoryUpdateTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategoryUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxCategoryUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxCategoryUpdateBuilder builder) {
         TaxCategoryUpdate taxCategoryUpdate = builder.buildUnchecked();
         Assertions.assertThat(taxCategoryUpdate).isInstanceOf(TaxCategoryUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxCategoryUpdate.builder().version(2L) },
-                new Object[] { TaxCategoryUpdate.builder()
-                        .actions(Collections.singletonList(
-                            new com.commercetools.api.models.tax_category.TaxCategoryUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", TaxCategoryUpdate.builder().version(2L) },
+                new Object[] { "actions",
+                        TaxCategoryUpdate.builder()
+                                .actions(Collections.singletonList(
+                                    new com.commercetools.api.models.tax_category.TaxCategoryUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxRateDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxRateDraftTest.java
index c116c43ae43..be1df79ea76 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxRateDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxRateDraftTest.java
@@ -3,39 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxRateDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxRateDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxRateDraftBuilder builder) {
         TaxRateDraft taxRateDraft = builder.buildUnchecked();
         Assertions.assertThat(taxRateDraft).isInstanceOf(TaxRateDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxRateDraft.builder().name("name") },
-                new Object[] { TaxRateDraft.builder().amount(0.43789625) },
-                new Object[] { TaxRateDraft.builder().includedInPrice(true) },
-                new Object[] { TaxRateDraft.builder().country("country") },
-                new Object[] { TaxRateDraft.builder().state("state") },
-                new Object[] {
+        return new Object[][] { new Object[] { "name", TaxRateDraft.builder().name("name") },
+                new Object[] { "amount", TaxRateDraft.builder().amount(0.43789625) },
+                new Object[] { "includedInPrice", TaxRateDraft.builder().includedInPrice(true) },
+                new Object[] { "country", TaxRateDraft.builder().country("country") },
+                new Object[] { "state", TaxRateDraft.builder().state("state") },
+                new Object[] { "subRates",
                         TaxRateDraft.builder()
                                 .subRates(Collections
                                         .singletonList(new com.commercetools.api.models.tax_category.SubRateImpl())) },
-                new Object[] { TaxRateDraft.builder().key("key") } };
+                new Object[] { "key", TaxRateDraft.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxRateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxRateTest.java
index b03f004afbc..49fcc41e05f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxRateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/tax_category/TaxRateTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxRateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxRateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxRateBuilder builder) {
         TaxRate taxRate = builder.buildUnchecked();
         Assertions.assertThat(taxRate).isInstanceOf(TaxRate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxRate.builder().id("id") },
-                new Object[] { TaxRate.builder().key("key") }, new Object[] { TaxRate.builder().name("name") },
-                new Object[] { TaxRate.builder().amount(0.43789625) },
-                new Object[] { TaxRate.builder().includedInPrice(true) },
-                new Object[] { TaxRate.builder().country("country") },
-                new Object[] { TaxRate.builder().state("state") },
-                new Object[] { TaxRate.builder()
+        return new Object[][] { new Object[] { "id", TaxRate.builder().id("id") },
+                new Object[] { "key", TaxRate.builder().key("key") },
+                new Object[] { "name", TaxRate.builder().name("name") },
+                new Object[] { "amount", TaxRate.builder().amount(0.43789625) },
+                new Object[] { "includedInPrice", TaxRate.builder().includedInPrice(true) },
+                new Object[] { "country", TaxRate.builder().country("country") },
+                new Object[] { "state", TaxRate.builder().state("state") },
+                new Object[] { "subRates", TaxRate.builder()
                         .subRates(
                             Collections.singletonList(new com.commercetools.api.models.tax_category.SubRateImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldBooleanTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldBooleanTypeTest.java
index a57f44ce048..7e86c83f481 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldBooleanTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldBooleanTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldBooleanTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldDateTimeTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldDateTimeTypeTest.java
index 8e7be96bc3b..50e1f5a85ef 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldDateTimeTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldDateTimeTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldDateTimeTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldDateTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldDateTypeTest.java
index 849e5f6ac8f..2dc3d1d2a81 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldDateTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldDateTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldDateTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldEnumTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldEnumTypeTest.java
index 2dd6f31b1dc..b6a1ae82e0d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldEnumTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldEnumTypeTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldEnumTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldEnumTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldEnumTypeBuilder builder) {
         CustomFieldEnumType customFieldEnumType = builder.buildUnchecked();
         Assertions.assertThat(customFieldEnumType).isInstanceOf(CustomFieldEnumType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomFieldEnumType.builder()
+        return new Object[][] { new Object[] { "values", CustomFieldEnumType.builder()
                 .values(
                     Collections.singletonList(new com.commercetools.api.models.type.CustomFieldEnumValueImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldEnumValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldEnumValueTest.java
index cf8141b7af1..fbbacfc2976 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldEnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldEnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldEnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldEnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldEnumValueBuilder builder) {
         CustomFieldEnumValue customFieldEnumValue = builder.buildUnchecked();
         Assertions.assertThat(customFieldEnumValue).isInstanceOf(CustomFieldEnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomFieldEnumValue.builder().key("key") },
-                new Object[] { CustomFieldEnumValue.builder().label("label") } };
+        return new Object[][] { new Object[] { "key", CustomFieldEnumValue.builder().key("key") },
+                new Object[] { "label", CustomFieldEnumValue.builder().label("label") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldLocalizedEnumTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldLocalizedEnumTypeTest.java
index c21303a05e3..ed8cf5bcade 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldLocalizedEnumTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldLocalizedEnumTypeTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldLocalizedEnumTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldLocalizedEnumTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldLocalizedEnumTypeBuilder builder) {
         CustomFieldLocalizedEnumType customFieldLocalizedEnumType = builder.buildUnchecked();
         Assertions.assertThat(customFieldLocalizedEnumType).isInstanceOf(CustomFieldLocalizedEnumType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomFieldLocalizedEnumType.builder()
-                .values(Collections
-                        .singletonList(new com.commercetools.api.models.type.CustomFieldLocalizedEnumValueImpl())) } };
+        return new Object[][] { new Object[] { "values",
+                CustomFieldLocalizedEnumType.builder()
+                        .values(Collections.singletonList(
+                            new com.commercetools.api.models.type.CustomFieldLocalizedEnumValueImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldLocalizedEnumValueTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldLocalizedEnumValueTest.java
index b61cdd68bf7..0c74302b0f3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldLocalizedEnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldLocalizedEnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldLocalizedEnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldLocalizedEnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldLocalizedEnumValueBuilder builder) {
         CustomFieldLocalizedEnumValue customFieldLocalizedEnumValue = builder.buildUnchecked();
         Assertions.assertThat(customFieldLocalizedEnumValue).isInstanceOf(CustomFieldLocalizedEnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomFieldLocalizedEnumValue.builder().key("key") },
-                new Object[] { CustomFieldLocalizedEnumValue.builder()
+        return new Object[][] { new Object[] { "key", CustomFieldLocalizedEnumValue.builder().key("key") },
+                new Object[] { "label", CustomFieldLocalizedEnumValue.builder()
                         .label(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldLocalizedStringTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldLocalizedStringTypeTest.java
index 98f7edb9dd9..8c34e882e0c 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldLocalizedStringTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldLocalizedStringTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldLocalizedStringTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldMoneyTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldMoneyTypeTest.java
index 8ef867df66b..0c8a17de850 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldMoneyTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldMoneyTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldMoneyTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldNumberTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldNumberTypeTest.java
index e601f4be720..cf1f66dd260 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldNumberTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldNumberTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldNumberTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldReferenceTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldReferenceTypeTest.java
index 9da5f60ce53..c751eec7362 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldReferenceTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldReferenceTypeTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldReferenceTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldReferenceTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldReferenceTypeBuilder builder) {
         CustomFieldReferenceType customFieldReferenceType = builder.buildUnchecked();
         Assertions.assertThat(customFieldReferenceType).isInstanceOf(CustomFieldReferenceType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomFieldReferenceType.builder()
-                .referenceTypeId(
-                    com.commercetools.api.models.type.CustomFieldReferenceValue.findEnum("approval-flow")) } };
+        return new Object[][] { new Object[] { "referenceTypeId",
+                CustomFieldReferenceType.builder()
+                        .referenceTypeId(
+                            com.commercetools.api.models.type.CustomFieldReferenceValue.findEnum("approval-flow")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldSetTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldSetTypeTest.java
index fc8efe4ac54..6a32c966e75 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldSetTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldSetTypeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldSetTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldSetTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldSetTypeBuilder builder) {
         CustomFieldSetType customFieldSetType = builder.buildUnchecked();
         Assertions.assertThat(customFieldSetType).isInstanceOf(CustomFieldSetType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "elementType",
                 CustomFieldSetType.builder().elementType(new com.commercetools.api.models.type.FieldTypeImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldStringTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldStringTypeTest.java
index f492596b71b..b1b458ea29a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldStringTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldStringTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldStringTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldTimeTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldTimeTypeTest.java
index e33cf8e452b..ad18087f78e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldTimeTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldTimeTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldTimeTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldsDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldsDraftTest.java
index 49ae75e9fb8..297b915a25a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldsDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldsDraftTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldsDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldsDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldsDraftBuilder builder) {
         CustomFieldsDraft customFieldsDraft = builder.buildUnchecked();
         Assertions.assertThat(customFieldsDraft).isInstanceOf(CustomFieldsDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomFieldsDraft.builder()
-                        .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
-                new Object[] { CustomFieldsDraft.builder()
+                new Object[] { "type",
+                        CustomFieldsDraft.builder()
+                                .type(new com.commercetools.api.models.type.TypeResourceIdentifierImpl()) },
+                new Object[] { "fields", CustomFieldsDraft.builder()
                         .fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldsTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldsTest.java
index 70c5adcd028..10fed8108ee 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldsTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/CustomFieldsTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldsBuilder builder) {
         CustomFields customFields = builder.buildUnchecked();
         Assertions.assertThat(customFields).isInstanceOf(CustomFields.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomFields.builder().type(new com.commercetools.api.models.type.TypeReferenceImpl()) },
-                new Object[] {
+                new Object[] { "type",
+                        CustomFields.builder().type(new com.commercetools.api.models.type.TypeReferenceImpl()) },
+                new Object[] { "fields",
                         CustomFields.builder().fields(new com.commercetools.api.models.type.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/FieldContainerTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/FieldContainerTest.java
index 59d42700ea7..7b072a4d6f1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/FieldContainerTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/FieldContainerTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class FieldContainerTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/FieldDefinitionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/FieldDefinitionTest.java
index ca930b57bc9..6f42b899988 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/FieldDefinitionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/FieldDefinitionTest.java
@@ -1,35 +1,30 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class FieldDefinitionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(FieldDefinitionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, FieldDefinitionBuilder builder) {
         FieldDefinition fieldDefinition = builder.buildUnchecked();
         Assertions.assertThat(fieldDefinition).isInstanceOf(FieldDefinition.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { FieldDefinition.builder().type(new com.commercetools.api.models.type.FieldTypeImpl()) },
-                new Object[] { FieldDefinition.builder().name("name") },
-                new Object[] { FieldDefinition.builder()
-                        .label(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { FieldDefinition.builder().required(true) }, new Object[] { FieldDefinition.builder()
+                new Object[] { "type",
+                        FieldDefinition.builder().type(new com.commercetools.api.models.type.FieldTypeImpl()) },
+                new Object[] { "name", FieldDefinition.builder().name("name") },
+                new Object[] { "label",
+                        FieldDefinition.builder()
+                                .label(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "required", FieldDefinition.builder().required(true) },
+                new Object[] { "inputHint", FieldDefinition.builder()
                         .inputHint(com.commercetools.api.models.type.TypeTextInputHint.findEnum("SingleLine")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeAddEnumValueActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeAddEnumValueActionTest.java
index 056c90815c9..e38f37b9d2b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeAddEnumValueActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeAddEnumValueActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeAddEnumValueActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeAddEnumValueActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeAddEnumValueActionBuilder builder) {
         TypeAddEnumValueAction typeAddEnumValueAction = builder.buildUnchecked();
         Assertions.assertThat(typeAddEnumValueAction).isInstanceOf(TypeAddEnumValueAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeAddEnumValueAction.builder().fieldName("fieldName") },
-                new Object[] { TypeAddEnumValueAction.builder()
+        return new Object[][] { new Object[] { "fieldName", TypeAddEnumValueAction.builder().fieldName("fieldName") },
+                new Object[] { "value", TypeAddEnumValueAction.builder()
                         .value(new com.commercetools.api.models.type.CustomFieldEnumValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeAddFieldDefinitionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeAddFieldDefinitionActionTest.java
index d6e29e17241..cf5057854ea 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeAddFieldDefinitionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeAddFieldDefinitionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeAddFieldDefinitionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeAddFieldDefinitionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeAddFieldDefinitionActionBuilder builder) {
         TypeAddFieldDefinitionAction typeAddFieldDefinitionAction = builder.buildUnchecked();
         Assertions.assertThat(typeAddFieldDefinitionAction).isInstanceOf(TypeAddFieldDefinitionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeAddFieldDefinitionAction.builder()
+        return new Object[][] { new Object[] { "fieldDefinition", TypeAddFieldDefinitionAction.builder()
                 .fieldDefinition(new com.commercetools.api.models.type.FieldDefinitionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeAddLocalizedEnumValueActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeAddLocalizedEnumValueActionTest.java
index 20db005e288..5051ee766a7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeAddLocalizedEnumValueActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeAddLocalizedEnumValueActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeAddLocalizedEnumValueActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeAddLocalizedEnumValueActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeAddLocalizedEnumValueActionBuilder builder) {
         TypeAddLocalizedEnumValueAction typeAddLocalizedEnumValueAction = builder.buildUnchecked();
         Assertions.assertThat(typeAddLocalizedEnumValueAction).isInstanceOf(TypeAddLocalizedEnumValueAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeAddLocalizedEnumValueAction.builder().fieldName("fieldName") },
-                new Object[] { TypeAddLocalizedEnumValueAction.builder()
+        return new Object[][] {
+                new Object[] { "fieldName", TypeAddLocalizedEnumValueAction.builder().fieldName("fieldName") },
+                new Object[] { "value", TypeAddLocalizedEnumValueAction.builder()
                         .value(new com.commercetools.api.models.type.CustomFieldLocalizedEnumValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeEnumValueLabelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeEnumValueLabelActionTest.java
index e0fedcd65de..aed7bef64f1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeEnumValueLabelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeEnumValueLabelActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeChangeEnumValueLabelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeChangeEnumValueLabelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeChangeEnumValueLabelActionBuilder builder) {
         TypeChangeEnumValueLabelAction typeChangeEnumValueLabelAction = builder.buildUnchecked();
         Assertions.assertThat(typeChangeEnumValueLabelAction).isInstanceOf(TypeChangeEnumValueLabelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeChangeEnumValueLabelAction.builder().fieldName("fieldName") },
-                new Object[] { TypeChangeEnumValueLabelAction.builder()
+        return new Object[][] {
+                new Object[] { "fieldName", TypeChangeEnumValueLabelAction.builder().fieldName("fieldName") },
+                new Object[] { "value", TypeChangeEnumValueLabelAction.builder()
                         .value(new com.commercetools.api.models.type.CustomFieldEnumValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeEnumValueOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeEnumValueOrderActionTest.java
index 7d6e8b34293..a460418e094 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeEnumValueOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeEnumValueOrderActionTest.java
@@ -3,31 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeChangeEnumValueOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeChangeEnumValueOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeChangeEnumValueOrderActionBuilder builder) {
         TypeChangeEnumValueOrderAction typeChangeEnumValueOrderAction = builder.buildUnchecked();
         Assertions.assertThat(typeChangeEnumValueOrderAction).isInstanceOf(TypeChangeEnumValueOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeChangeEnumValueOrderAction.builder().fieldName("fieldName") },
-                new Object[] { TypeChangeEnumValueOrderAction.builder().keys(Collections.singletonList("keys")) } };
+        return new Object[][] {
+                new Object[] { "fieldName", TypeChangeEnumValueOrderAction.builder().fieldName("fieldName") },
+                new Object[] { "keys",
+                        TypeChangeEnumValueOrderAction.builder().keys(Collections.singletonList("keys")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeFieldDefinitionOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeFieldDefinitionOrderActionTest.java
index cd4a118c1b6..70aa5159198 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeFieldDefinitionOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeFieldDefinitionOrderActionTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeChangeFieldDefinitionOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeChangeFieldDefinitionOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeChangeFieldDefinitionOrderActionBuilder builder) {
         TypeChangeFieldDefinitionOrderAction typeChangeFieldDefinitionOrderAction = builder.buildUnchecked();
         Assertions.assertThat(typeChangeFieldDefinitionOrderAction)
                 .isInstanceOf(TypeChangeFieldDefinitionOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "fieldNames",
                 TypeChangeFieldDefinitionOrderAction.builder().fieldNames(Collections.singletonList("fieldNames")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeInputHintActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeInputHintActionTest.java
index c2fa5e1c5a8..9e07bd4aad7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeInputHintActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeInputHintActionTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeChangeInputHintActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeChangeInputHintActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeChangeInputHintActionBuilder builder) {
         TypeChangeInputHintAction typeChangeInputHintAction = builder.buildUnchecked();
         Assertions.assertThat(typeChangeInputHintAction).isInstanceOf(TypeChangeInputHintAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeChangeInputHintAction.builder().fieldName("fieldName") },
-                new Object[] { TypeChangeInputHintAction.builder()
+        return new Object[][] {
+                new Object[] { "fieldName", TypeChangeInputHintAction.builder().fieldName("fieldName") },
+                new Object[] { "inputHint", TypeChangeInputHintAction.builder()
                         .inputHint(com.commercetools.api.models.type.TypeTextInputHint.findEnum("SingleLine")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeKeyActionTest.java
index 2616710c5e4..a7b7246e4f1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeChangeKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeChangeKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeChangeKeyActionBuilder builder) {
         TypeChangeKeyAction typeChangeKeyAction = builder.buildUnchecked();
         Assertions.assertThat(typeChangeKeyAction).isInstanceOf(TypeChangeKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeChangeKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", TypeChangeKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeLabelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeLabelActionTest.java
index f7c2e3272c2..de3bb73f1f2 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeLabelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeLabelActionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeChangeLabelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeChangeLabelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeChangeLabelActionBuilder builder) {
         TypeChangeLabelAction typeChangeLabelAction = builder.buildUnchecked();
         Assertions.assertThat(typeChangeLabelAction).isInstanceOf(TypeChangeLabelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeChangeLabelAction.builder().fieldName("fieldName") },
-                new Object[] { TypeChangeLabelAction.builder()
+        return new Object[][] { new Object[] { "fieldName", TypeChangeLabelAction.builder().fieldName("fieldName") },
+                new Object[] { "label", TypeChangeLabelAction.builder()
                         .label(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeLocalizedEnumValueLabelActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeLocalizedEnumValueLabelActionTest.java
index 90b87d813e1..e8c6a961763 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeLocalizedEnumValueLabelActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeLocalizedEnumValueLabelActionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeChangeLocalizedEnumValueLabelActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeChangeLocalizedEnumValueLabelActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeChangeLocalizedEnumValueLabelActionBuilder builder) {
         TypeChangeLocalizedEnumValueLabelAction typeChangeLocalizedEnumValueLabelAction = builder.buildUnchecked();
         Assertions.assertThat(typeChangeLocalizedEnumValueLabelAction)
                 .isInstanceOf(TypeChangeLocalizedEnumValueLabelAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { TypeChangeLocalizedEnumValueLabelAction.builder().fieldName("fieldName") },
-                new Object[] { TypeChangeLocalizedEnumValueLabelAction.builder()
+                new Object[] { "fieldName", TypeChangeLocalizedEnumValueLabelAction.builder().fieldName("fieldName") },
+                new Object[] { "value", TypeChangeLocalizedEnumValueLabelAction.builder()
                         .value(new com.commercetools.api.models.type.CustomFieldLocalizedEnumValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeLocalizedEnumValueOrderActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeLocalizedEnumValueOrderActionTest.java
index 56f8c2fd0f6..db3282e7cf3 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeLocalizedEnumValueOrderActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeLocalizedEnumValueOrderActionTest.java
@@ -3,33 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeChangeLocalizedEnumValueOrderActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeChangeLocalizedEnumValueOrderActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeChangeLocalizedEnumValueOrderActionBuilder builder) {
         TypeChangeLocalizedEnumValueOrderAction typeChangeLocalizedEnumValueOrderAction = builder.buildUnchecked();
         Assertions.assertThat(typeChangeLocalizedEnumValueOrderAction)
                 .isInstanceOf(TypeChangeLocalizedEnumValueOrderAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { TypeChangeLocalizedEnumValueOrderAction.builder().fieldName("fieldName") },
-                new Object[] {
+                new Object[] { "fieldName", TypeChangeLocalizedEnumValueOrderAction.builder().fieldName("fieldName") },
+                new Object[] { "keys",
                         TypeChangeLocalizedEnumValueOrderAction.builder().keys(Collections.singletonList("keys")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeNameActionTest.java
index 0783356e0d3..329e6938c2f 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeChangeNameActionBuilder builder) {
         TypeChangeNameAction typeChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(typeChangeNameAction).isInstanceOf(TypeChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "name",
                 TypeChangeNameAction.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeDraftTest.java
index 32d35ec9123..55ace7d4dfc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeDraftTest.java
@@ -3,38 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeDraftBuilder builder) {
         TypeDraft typeDraft = builder.buildUnchecked();
         Assertions.assertThat(typeDraft).isInstanceOf(TypeDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeDraft.builder().key("key") },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", TypeDraft.builder().key("key") },
+                new Object[] { "name",
                         TypeDraft.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { TypeDraft.builder()
-                        .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { TypeDraft.builder()
-                        .resourceTypeIds(Collections
-                                .singletonList(com.commercetools.api.models.type.ResourceTypeId.findEnum("address"))) },
-                new Object[] { TypeDraft.builder()
+                new Object[] { "description",
+                        TypeDraft.builder()
+                                .description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "resourceTypeIds",
+                        TypeDraft.builder()
+                                .resourceTypeIds(Collections.singletonList(
+                                    com.commercetools.api.models.type.ResourceTypeId.findEnum("address"))) },
+                new Object[] { "fieldDefinitions", TypeDraft.builder()
                         .fieldDefinitions(
                             Collections.singletonList(new com.commercetools.api.models.type.FieldDefinitionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypePagedQueryResponseTest.java
index c378f420c86..7862c9bdf7b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypePagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypePagedQueryResponseBuilder builder) {
         TypePagedQueryResponse typePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(typePagedQueryResponse).isInstanceOf(TypePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypePagedQueryResponse.builder().limit(7L) },
-                new Object[] { TypePagedQueryResponse.builder().offset(3L) },
-                new Object[] { TypePagedQueryResponse.builder().count(2L) },
-                new Object[] { TypePagedQueryResponse.builder().total(1L) },
-                new Object[] { TypePagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", TypePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", TypePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", TypePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", TypePagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", TypePagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.type.TypeImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeReferenceTest.java
index e6ef645a92d..68c044399b6 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeReferenceTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeReferenceBuilder builder) {
         TypeReference typeReference = builder.buildUnchecked();
         Assertions.assertThat(typeReference).isInstanceOf(TypeReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeReference.builder().id("id") },
-                new Object[] { TypeReference.builder().obj(new com.commercetools.api.models.type.TypeImpl()) } };
+        return new Object[][] { new Object[] { "id", TypeReference.builder().id("id") },
+                new Object[] { "obj", TypeReference.builder().obj(new com.commercetools.api.models.type.TypeImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeRemoveFieldDefinitionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeRemoveFieldDefinitionActionTest.java
index 83d68a386a3..b36dc9809ef 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeRemoveFieldDefinitionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeRemoveFieldDefinitionActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeRemoveFieldDefinitionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeRemoveFieldDefinitionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeRemoveFieldDefinitionActionBuilder builder) {
         TypeRemoveFieldDefinitionAction typeRemoveFieldDefinitionAction = builder.buildUnchecked();
         Assertions.assertThat(typeRemoveFieldDefinitionAction).isInstanceOf(TypeRemoveFieldDefinitionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeRemoveFieldDefinitionAction.builder().fieldName("fieldName") } };
+        return new Object[][] {
+                new Object[] { "fieldName", TypeRemoveFieldDefinitionAction.builder().fieldName("fieldName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeResourceIdentifierTest.java
index 0ce552e7ec6..510a5b06f4e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeResourceIdentifierBuilder builder) {
         TypeResourceIdentifier typeResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(typeResourceIdentifier).isInstanceOf(TypeResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeResourceIdentifier.builder().id("id") },
-                new Object[] { TypeResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", TypeResourceIdentifier.builder().id("id") },
+                new Object[] { "key", TypeResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeSetDescriptionActionTest.java
index 017d36ee37a..701269a746d 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeSetDescriptionActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.type;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeSetDescriptionActionBuilder builder) {
         TypeSetDescriptionAction typeSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(typeSetDescriptionAction).isInstanceOf(TypeSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeSetDescriptionAction.builder()
+        return new Object[][] { new Object[] { "description", TypeSetDescriptionAction.builder()
                 .description(new com.commercetools.api.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeTest.java
index 058a46b0601..3713c457a27 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeTest.java
@@ -4,43 +4,40 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeBuilder builder) {
         Type type = builder.buildUnchecked();
         Assertions.assertThat(type).isInstanceOf(Type.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Type.builder().id("id") }, new Object[] { Type.builder().version(2L) },
-                new Object[] { Type.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Type.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Type.builder().id("id") },
+                new Object[] { "version", Type.builder().version(2L) },
+                new Object[] { "createdAt", Type.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Type.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
                         Type.builder().lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Type.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { Type.builder().key("key") },
-                new Object[] { Type.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] {
+                new Object[] { "createdBy",
+                        Type.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
+                new Object[] { "key", Type.builder().key("key") },
+                new Object[] { "name",
+                        Type.builder().name(new com.commercetools.api.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
                         Type.builder().description(new com.commercetools.api.models.common.LocalizedStringImpl()) },
-                new Object[] { Type.builder()
-                        .resourceTypeIds(Collections
-                                .singletonList(com.commercetools.api.models.type.ResourceTypeId.findEnum("address"))) },
-                new Object[] { Type.builder()
+                new Object[] { "resourceTypeIds",
+                        Type.builder()
+                                .resourceTypeIds(Collections.singletonList(
+                                    com.commercetools.api.models.type.ResourceTypeId.findEnum("address"))) },
+                new Object[] { "fieldDefinitions", Type.builder()
                         .fieldDefinitions(
                             Collections.singletonList(new com.commercetools.api.models.type.FieldDefinitionImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeUpdateTest.java
index 999fc906842..69b7d4906b5 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/type/TypeUpdateTest.java
@@ -3,31 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeUpdateBuilder builder) {
         TypeUpdate typeUpdate = builder.buildUnchecked();
         Assertions.assertThat(typeUpdate).isInstanceOf(TypeUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeUpdate.builder().version(2L) }, new Object[] { TypeUpdate.builder()
-                .actions(Collections.singletonList(new com.commercetools.api.models.type.TypeUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", TypeUpdate.builder().version(2L) }, new Object[] { "actions",
+                TypeUpdate.builder()
+                        .actions(Collections
+                                .singletonList(new com.commercetools.api.models.type.TypeUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/warning/ImageProcessingOngoingWarningTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/warning/ImageProcessingOngoingWarningTest.java
index 5bac3e287d9..16b1e42e387 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/warning/ImageProcessingOngoingWarningTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/warning/ImageProcessingOngoingWarningTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.warning;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImageProcessingOngoingWarningTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImageProcessingOngoingWarningBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImageProcessingOngoingWarningBuilder builder) {
         ImageProcessingOngoingWarning imageProcessingOngoingWarning = builder.buildUnchecked();
         Assertions.assertThat(imageProcessingOngoingWarning).isInstanceOf(ImageProcessingOngoingWarning.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImageProcessingOngoingWarning.builder().message("message") } };
+        return new Object[][] {
+                new Object[] { "message", ImageProcessingOngoingWarning.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/LocationTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/LocationTest.java
index 6839b47cea3..107f41ed417 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/LocationTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/LocationTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.zone;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocationBuilder builder) {
         Location location = builder.buildUnchecked();
         Assertions.assertThat(location).isInstanceOf(Location.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Location.builder().country("country") },
-                new Object[] { Location.builder().state("state") } };
+        return new Object[][] { new Object[] { "country", Location.builder().country("country") },
+                new Object[] { "state", Location.builder().state("state") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneAddLocationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneAddLocationActionTest.java
index c8d530cf92b..3d73b728162 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneAddLocationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneAddLocationActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.zone;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZoneAddLocationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZoneAddLocationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZoneAddLocationActionBuilder builder) {
         ZoneAddLocationAction zoneAddLocationAction = builder.buildUnchecked();
         Assertions.assertThat(zoneAddLocationAction).isInstanceOf(ZoneAddLocationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "location",
                 ZoneAddLocationAction.builder().location(new com.commercetools.api.models.zone.LocationImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneChangeNameActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneChangeNameActionTest.java
index 123e208a8fa..91f0fc80d6b 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneChangeNameActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneChangeNameActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.zone;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZoneChangeNameActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZoneChangeNameActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZoneChangeNameActionBuilder builder) {
         ZoneChangeNameAction zoneChangeNameAction = builder.buildUnchecked();
         Assertions.assertThat(zoneChangeNameAction).isInstanceOf(ZoneChangeNameAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ZoneChangeNameAction.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", ZoneChangeNameAction.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneDraftTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneDraftTest.java
index 7ecfe9e17db..1157aa0e3ce 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneDraftTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneDraftTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZoneDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZoneDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZoneDraftBuilder builder) {
         ZoneDraft zoneDraft = builder.buildUnchecked();
         Assertions.assertThat(zoneDraft).isInstanceOf(ZoneDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ZoneDraft.builder().key("key") },
-                new Object[] { ZoneDraft.builder().name("name") },
-                new Object[] { ZoneDraft.builder().description("description") }, new Object[] { ZoneDraft.builder()
+        return new Object[][] { new Object[] { "key", ZoneDraft.builder().key("key") },
+                new Object[] { "name", ZoneDraft.builder().name("name") },
+                new Object[] { "description", ZoneDraft.builder().description("description") },
+                new Object[] { "locations", ZoneDraft.builder()
                         .locations(Collections.singletonList(new com.commercetools.api.models.zone.LocationImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZonePagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZonePagedQueryResponseTest.java
index 67dca5eaf7c..b0ad3c7dddc 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZonePagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZonePagedQueryResponseTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZonePagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZonePagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZonePagedQueryResponseBuilder builder) {
         ZonePagedQueryResponse zonePagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(zonePagedQueryResponse).isInstanceOf(ZonePagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ZonePagedQueryResponse.builder().limit(7L) },
-                new Object[] { ZonePagedQueryResponse.builder().offset(3L) },
-                new Object[] { ZonePagedQueryResponse.builder().count(2L) },
-                new Object[] { ZonePagedQueryResponse.builder().total(1L) },
-                new Object[] { ZonePagedQueryResponse.builder()
+        return new Object[][] { new Object[] { "limit", ZonePagedQueryResponse.builder().limit(7L) },
+                new Object[] { "offset", ZonePagedQueryResponse.builder().offset(3L) },
+                new Object[] { "count", ZonePagedQueryResponse.builder().count(2L) },
+                new Object[] { "total", ZonePagedQueryResponse.builder().total(1L) },
+                new Object[] { "results", ZonePagedQueryResponse.builder()
                         .results(Collections.singletonList(new com.commercetools.api.models.zone.ZoneImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneReferenceTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneReferenceTest.java
index d9fedf19398..50eba0aedef 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneReferenceTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.api.models.zone;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZoneReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZoneReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZoneReferenceBuilder builder) {
         ZoneReference zoneReference = builder.buildUnchecked();
         Assertions.assertThat(zoneReference).isInstanceOf(ZoneReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ZoneReference.builder().obj(new com.commercetools.api.models.zone.ZoneImpl()) },
-                new Object[] { ZoneReference.builder().id("id") } };
+                new Object[] { "obj", ZoneReference.builder().obj(new com.commercetools.api.models.zone.ZoneImpl()) },
+                new Object[] { "id", ZoneReference.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneRemoveLocationActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneRemoveLocationActionTest.java
index 17981743881..0abd3e257cd 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneRemoveLocationActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneRemoveLocationActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.zone;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZoneRemoveLocationActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZoneRemoveLocationActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZoneRemoveLocationActionBuilder builder) {
         ZoneRemoveLocationAction zoneRemoveLocationAction = builder.buildUnchecked();
         Assertions.assertThat(zoneRemoveLocationAction).isInstanceOf(ZoneRemoveLocationAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "location",
                 ZoneRemoveLocationAction.builder().location(new com.commercetools.api.models.zone.LocationImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneResourceIdentifierTest.java
index a3fbe29fa4f..ea4478b5fd1 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneResourceIdentifierTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.api.models.zone;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZoneResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZoneResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZoneResourceIdentifierBuilder builder) {
         ZoneResourceIdentifier zoneResourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(zoneResourceIdentifier).isInstanceOf(ZoneResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ZoneResourceIdentifier.builder().id("id") },
-                new Object[] { ZoneResourceIdentifier.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", ZoneResourceIdentifier.builder().id("id") },
+                new Object[] { "key", ZoneResourceIdentifier.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneSetDescriptionActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneSetDescriptionActionTest.java
index 2d0f915ac93..b69ef56e16e 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneSetDescriptionActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneSetDescriptionActionTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.api.models.zone;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZoneSetDescriptionActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZoneSetDescriptionActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZoneSetDescriptionActionBuilder builder) {
         ZoneSetDescriptionAction zoneSetDescriptionAction = builder.buildUnchecked();
         Assertions.assertThat(zoneSetDescriptionAction).isInstanceOf(ZoneSetDescriptionAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ZoneSetDescriptionAction.builder().description("description") } };
+        return new Object[][] {
+                new Object[] { "description", ZoneSetDescriptionAction.builder().description("description") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneSetKeyActionTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneSetKeyActionTest.java
index fe53b10deaf..7e57519ea33 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneSetKeyActionTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneSetKeyActionTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.api.models.zone;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZoneSetKeyActionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZoneSetKeyActionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZoneSetKeyActionBuilder builder) {
         ZoneSetKeyAction zoneSetKeyAction = builder.buildUnchecked();
         Assertions.assertThat(zoneSetKeyAction).isInstanceOf(ZoneSetKeyAction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ZoneSetKeyAction.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ZoneSetKeyAction.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneTest.java
index bf515ff2b93..889ca6ab54a 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneTest.java
@@ -4,37 +4,33 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZoneTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZoneBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZoneBuilder builder) {
         Zone zone = builder.buildUnchecked();
         Assertions.assertThat(zone).isInstanceOf(Zone.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Zone.builder().id("id") }, new Object[] { Zone.builder().version(2L) },
-                new Object[] { Zone.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Zone.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Zone.builder().id("id") },
+                new Object[] { "version", Zone.builder().version(2L) },
+                new Object[] { "createdAt", Zone.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        Zone.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedBy",
                         Zone.builder().lastModifiedBy(new com.commercetools.api.models.common.LastModifiedByImpl()) },
-                new Object[] { Zone.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
-                new Object[] { Zone.builder().key("key") }, new Object[] { Zone.builder().name("name") },
-                new Object[] { Zone.builder().description("description") }, new Object[] { Zone.builder()
+                new Object[] { "createdBy",
+                        Zone.builder().createdBy(new com.commercetools.api.models.common.CreatedByImpl()) },
+                new Object[] { "key", Zone.builder().key("key") }, new Object[] { "name", Zone.builder().name("name") },
+                new Object[] { "description", Zone.builder().description("description") },
+                new Object[] { "locations", Zone.builder()
                         .locations(Collections.singletonList(new com.commercetools.api.models.zone.LocationImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneUpdateTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneUpdateTest.java
index 228633dd53f..b106a0ef4c7 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneUpdateTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/zone/ZoneUpdateTest.java
@@ -3,31 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ZoneUpdateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ZoneUpdateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ZoneUpdateBuilder builder) {
         ZoneUpdate zoneUpdate = builder.buildUnchecked();
         Assertions.assertThat(zoneUpdate).isInstanceOf(ZoneUpdate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ZoneUpdate.builder().version(2L) }, new Object[] { ZoneUpdate.builder()
-                .actions(Collections.singletonList(new com.commercetools.api.models.zone.ZoneUpdateActionImpl())) } };
+        return new Object[][] { new Object[] { "version", ZoneUpdate.builder().version(2L) }, new Object[] { "actions",
+                ZoneUpdate.builder()
+                        .actions(Collections
+                                .singletonList(new com.commercetools.api.models.zone.ZoneUpdateActionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyByResourceTypeByIDTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyByResourceTypeByIDTest.java
index 1c9764ad0fd..e2e1d0418c3 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyByResourceTypeByIDTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyByResourceTypeByIDTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.history.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyByResourceTypeByIDTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -186,7 +179,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "get", "test_projectKey/test_resourceType/test_ID", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyByResourceTypeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyByResourceTypeTest.java
index 5d5fdc78187..a8f1d65f11a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyByResourceTypeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyByResourceTypeTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.history.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyByResourceTypeTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
@@ -163,7 +156,6 @@ public static Object[][] requestWithMethodParameters() {
                         .createHttpRequest(), "get", "test_projectKey/test_resourceType", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyGraphqlTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyGraphqlTest.java
index 8b8a0cfba83..c3de3aac14f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyGraphqlTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyGraphqlTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.history.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyGraphqlTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .graphql()
@@ -69,7 +62,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "post", "test_projectKey/graphql", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .graphql()
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyTest.java
index 966938568ce..072950730b8 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/client/resource/ByProjectKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.history.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
@@ -135,7 +128,6 @@ public static Object[][] requestWithMethodParameters() {
                         "test_projectKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/cart_discount/PatternComponentTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/cart_discount/PatternComponentTest.java
index 3d2257cc84e..e76ed0fe195 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/cart_discount/PatternComponentTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/cart_discount/PatternComponentTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.cart_discount;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PatternComponentTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PatternComponentBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PatternComponentBuilder builder) {
         PatternComponent patternComponent = builder.buildUnchecked();
         Assertions.assertThat(patternComponent).isInstanceOf(PatternComponent.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PatternComponent.builder().type("type") } };
+        return new Object[][] { new Object[] { "type", PatternComponent.builder().type("type") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAddressChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAddressChangeTest.java
index e8aa2cef44d..58615d73e2a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAddressChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAddressChangeTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddAddressChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddAddressChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddAddressChangeBuilder builder) {
         AddAddressChange addAddressChange = builder.buildUnchecked();
         Assertions.assertThat(addAddressChange).isInstanceOf(AddAddressChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddAddressChange.builder().change("change") }, new Object[] {
+        return new Object[][] { new Object[] { "change", AddAddressChange.builder().change("change") }, new Object[] {
+                "nextValue",
                 AddAddressChange.builder().nextValue(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAssetChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAssetChangeTest.java
index 80444a59aad..c6c954816c0 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAssetChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAssetChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddAssetChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddAssetChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddAssetChangeBuilder builder) {
         AddAssetChange addAssetChange = builder.buildUnchecked();
         Assertions.assertThat(addAssetChange).isInstanceOf(AddAssetChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddAssetChange.builder().change("change") },
-                new Object[] { AddAssetChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.AssetImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", AddAssetChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        AddAssetChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.AssetImpl()) },
+                new Object[] { "nextValue",
                         AddAssetChange.builder().nextValue(new com.commercetools.history.models.common.AssetImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAssociateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAssociateChangeTest.java
index e56344ce9bd..86a6e40de6c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAssociateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAssociateChangeTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddAssociateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddAssociateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddAssociateChangeBuilder builder) {
         AddAssociateChange addAssociateChange = builder.buildUnchecked();
         Assertions.assertThat(addAssociateChange).isInstanceOf(AddAssociateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddAssociateChange.builder().change("change") }, new Object[] {
+        return new Object[][] { new Object[] { "change", AddAssociateChange.builder().change("change") }, new Object[] {
+                "nextValue",
                 AddAssociateChange.builder().nextValue(new com.commercetools.history.models.common.AssociateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAttributeDefinitionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAttributeDefinitionChangeTest.java
index 9edcbd70051..fa8efc262e0 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAttributeDefinitionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAttributeDefinitionChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddAttributeDefinitionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddAttributeDefinitionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddAttributeDefinitionChangeBuilder builder) {
         AddAttributeDefinitionChange addAttributeDefinitionChange = builder.buildUnchecked();
         Assertions.assertThat(addAttributeDefinitionChange).isInstanceOf(AddAttributeDefinitionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddAttributeDefinitionChange.builder().change("change") },
-                new Object[] { AddAttributeDefinitionChange.builder()
+        return new Object[][] { new Object[] { "change", AddAttributeDefinitionChange.builder().change("change") },
+                new Object[] { "nextValue", AddAttributeDefinitionChange.builder()
                         .nextValue(new com.commercetools.history.models.common.AttributeDefinitionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddBillingAddressIdChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddBillingAddressIdChangeTest.java
index dfc12ca7487..81f5bbe16e0 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddBillingAddressIdChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddBillingAddressIdChangeTest.java
@@ -3,34 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddBillingAddressIdChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddBillingAddressIdChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddBillingAddressIdChangeBuilder builder) {
         AddBillingAddressIdChange addBillingAddressIdChange = builder.buildUnchecked();
         Assertions.assertThat(addBillingAddressIdChange).isInstanceOf(AddBillingAddressIdChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddBillingAddressIdChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", AddBillingAddressIdChange.builder().change("change") },
+                new Object[] { "previousValue",
                         AddBillingAddressIdChange.builder().previousValue(Collections.singletonList("previousValue")) },
-                new Object[] { AddBillingAddressIdChange.builder().nextValue(Collections.singletonList("nextValue")) },
-                new Object[] { AddBillingAddressIdChange.builder()
+                new Object[] { "nextValue",
+                        AddBillingAddressIdChange.builder().nextValue(Collections.singletonList("nextValue")) },
+                new Object[] { "address", AddBillingAddressIdChange.builder()
                         .address(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeTest.java
index a93dd26ee11..5e68b6a3f3e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddChannelRolesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddChannelRolesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddChannelRolesChangeBuilder builder) {
         AddChannelRolesChange addChannelRolesChange = builder.buildUnchecked();
         Assertions.assertThat(addChannelRolesChange).isInstanceOf(AddChannelRolesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddChannelRolesChange.builder().change("change") },
-                new Object[] { AddChannelRolesChange.builder()
+        return new Object[][] { new Object[] { "change", AddChannelRolesChange.builder().change("change") },
+                new Object[] { "previousValue", AddChannelRolesChange.builder()
                         .previousValue(Collections.singletonList(
                             com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply"))) },
-                new Object[] { AddChannelRolesChange.builder()
+                new Object[] { "nextValue", AddChannelRolesChange.builder()
                         .nextValue(Collections.singletonList(
                             com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply"))) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddCustomLineItemChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddCustomLineItemChangeTest.java
index 355e7b38c6d..b3ac93e10ea 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddCustomLineItemChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddCustomLineItemChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddCustomLineItemChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddCustomLineItemChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddCustomLineItemChangeBuilder builder) {
         AddCustomLineItemChange addCustomLineItemChange = builder.buildUnchecked();
         Assertions.assertThat(addCustomLineItemChange).isInstanceOf(AddCustomLineItemChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddCustomLineItemChange.builder().change("change") },
-                new Object[] { AddCustomLineItemChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.CustomLineItemImpl()) },
-                new Object[] { AddCustomLineItemChange.builder()
+        return new Object[][] { new Object[] { "change", AddCustomLineItemChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        AddCustomLineItemChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.CustomLineItemImpl()) },
+                new Object[] { "nextValue", AddCustomLineItemChange.builder()
                         .nextValue(new com.commercetools.history.models.common.CustomLineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddDeliveryChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddDeliveryChangeTest.java
index 24d3ffeab2c..2a7e5c808b7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddDeliveryChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddDeliveryChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddDeliveryChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddDeliveryChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddDeliveryChangeBuilder builder) {
         AddDeliveryChange addDeliveryChange = builder.buildUnchecked();
         Assertions.assertThat(addDeliveryChange).isInstanceOf(AddDeliveryChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddDeliveryChange.builder().change("change") },
-                new Object[] { AddDeliveryChange.builder()
+        return new Object[][] { new Object[] { "change", AddDeliveryChange.builder().change("change") },
+                new Object[] { "previousValue", AddDeliveryChange.builder()
                         .previousValue(new com.commercetools.history.models.change_value.DeliveryChangeValueImpl()) },
-                new Object[] { AddDeliveryChange.builder()
+                new Object[] { "nextValue", AddDeliveryChange.builder()
                         .nextValue(new com.commercetools.history.models.change_value.DeliveryChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddDiscountCodeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddDiscountCodeChangeTest.java
index 3a8f7e2a7e5..ff56738c8d1 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddDiscountCodeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddDiscountCodeChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddDiscountCodeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddDiscountCodeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddDiscountCodeChangeBuilder builder) {
         AddDiscountCodeChange addDiscountCodeChange = builder.buildUnchecked();
         Assertions.assertThat(addDiscountCodeChange).isInstanceOf(AddDiscountCodeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddDiscountCodeChange.builder().change("change") },
-                new Object[] { AddDiscountCodeChange.builder()
+        return new Object[][] { new Object[] { "change", AddDiscountCodeChange.builder().change("change") },
+                new Object[] { "nextValue", AddDiscountCodeChange.builder()
                         .nextValue(new com.commercetools.history.models.common.DiscountCodeInfoImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddEnumValueChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddEnumValueChangeTest.java
index 8ee55aec4b2..2098a79bbd0 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddEnumValueChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddEnumValueChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddEnumValueChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddEnumValueChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddEnumValueChangeBuilder builder) {
         AddEnumValueChange addEnumValueChange = builder.buildUnchecked();
         Assertions.assertThat(addEnumValueChange).isInstanceOf(AddEnumValueChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddEnumValueChange.builder().change("change") },
-                new Object[] { AddEnumValueChange.builder()
-                        .nextValue(new com.commercetools.history.models.change_value.EnumValueImpl()) },
-                new Object[] { AddEnumValueChange.builder().fieldName("fieldName") } };
+        return new Object[][] { new Object[] { "change", AddEnumValueChange.builder().change("change") },
+                new Object[] { "nextValue",
+                        AddEnumValueChange.builder()
+                                .nextValue(new com.commercetools.history.models.change_value.EnumValueImpl()) },
+                new Object[] { "fieldName", AddEnumValueChange.builder().fieldName("fieldName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddExternalImageChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddExternalImageChangeTest.java
index 8b41a00145b..fcd9dac959a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddExternalImageChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddExternalImageChangeTest.java
@@ -3,39 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddExternalImageChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddExternalImageChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddExternalImageChangeBuilder builder) {
         AddExternalImageChange addExternalImageChange = builder.buildUnchecked();
         Assertions.assertThat(addExternalImageChange).isInstanceOf(AddExternalImageChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddExternalImageChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", AddExternalImageChange.builder().change("change") },
+                new Object[] { "previousValue",
                         AddExternalImageChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ImageImpl())) },
-                new Object[] {
+                new Object[] { "nextValue",
                         AddExternalImageChange.builder()
                                 .nextValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ImageImpl())) },
-                new Object[] { AddExternalImageChange.builder().catalogData("catalogData") } };
+                new Object[] { "catalogData", AddExternalImageChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddFieldDefinitionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddFieldDefinitionChangeTest.java
index 4799dab7c88..4c6f8fe1377 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddFieldDefinitionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddFieldDefinitionChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddFieldDefinitionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddFieldDefinitionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddFieldDefinitionChangeBuilder builder) {
         AddFieldDefinitionChange addFieldDefinitionChange = builder.buildUnchecked();
         Assertions.assertThat(addFieldDefinitionChange).isInstanceOf(AddFieldDefinitionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddFieldDefinitionChange.builder().change("change") },
-                new Object[] { AddFieldDefinitionChange.builder()
+        return new Object[][] { new Object[] { "change", AddFieldDefinitionChange.builder().change("change") },
+                new Object[] { "nextValue", AddFieldDefinitionChange.builder()
                         .nextValue(new com.commercetools.history.models.common.FieldDefinitionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddInheritedAssociateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddInheritedAssociateChangeTest.java
index 4a1d04dc3dc..031771b4b1d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddInheritedAssociateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddInheritedAssociateChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddInheritedAssociateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddInheritedAssociateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddInheritedAssociateChangeBuilder builder) {
         AddInheritedAssociateChange addInheritedAssociateChange = builder.buildUnchecked();
         Assertions.assertThat(addInheritedAssociateChange).isInstanceOf(AddInheritedAssociateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddInheritedAssociateChange.builder().change("change") },
-                new Object[] { AddInheritedAssociateChange.builder()
+        return new Object[][] { new Object[] { "change", AddInheritedAssociateChange.builder().change("change") },
+                new Object[] { "nextValue", AddInheritedAssociateChange.builder()
                         .nextValue(new com.commercetools.history.models.common.InheritedAssociateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddInterfaceInteractionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddInterfaceInteractionChangeTest.java
index f829bcc0846..a8eb44cce24 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddInterfaceInteractionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddInterfaceInteractionChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddInterfaceInteractionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddInterfaceInteractionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddInterfaceInteractionChangeBuilder builder) {
         AddInterfaceInteractionChange addInterfaceInteractionChange = builder.buildUnchecked();
         Assertions.assertThat(addInterfaceInteractionChange).isInstanceOf(AddInterfaceInteractionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddInterfaceInteractionChange.builder().change("change") },
-                new Object[] { AddInterfaceInteractionChange.builder()
+        return new Object[][] { new Object[] { "change", AddInterfaceInteractionChange.builder().change("change") },
+                new Object[] { "nextValue", AddInterfaceInteractionChange.builder()
                         .nextValue(
                             new com.commercetools.history.models.change_value.CustomFieldExpandedValueImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddItemShippingAddressesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddItemShippingAddressesChangeTest.java
index 66baf4ab10f..8ea74de313d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddItemShippingAddressesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddItemShippingAddressesChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddItemShippingAddressesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddItemShippingAddressesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddItemShippingAddressesChangeBuilder builder) {
         AddItemShippingAddressesChange addItemShippingAddressesChange = builder.buildUnchecked();
         Assertions.assertThat(addItemShippingAddressesChange).isInstanceOf(AddItemShippingAddressesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddItemShippingAddressesChange.builder().change("change") },
-                new Object[] { AddItemShippingAddressesChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { AddItemShippingAddressesChange.builder()
+        return new Object[][] { new Object[] { "change", AddItemShippingAddressesChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        AddItemShippingAddressesChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "nextValue", AddItemShippingAddressesChange.builder()
                         .nextValue(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeTest.java
index 7231e862ae1..0e8ba472a4c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddLocalizedEnumValueChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddLocalizedEnumValueChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddLocalizedEnumValueChangeBuilder builder) {
         AddLocalizedEnumValueChange addLocalizedEnumValueChange = builder.buildUnchecked();
         Assertions.assertThat(addLocalizedEnumValueChange).isInstanceOf(AddLocalizedEnumValueChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddLocalizedEnumValueChange.builder().change("change") },
-                new Object[] { AddLocalizedEnumValueChange.builder()
+        return new Object[][] { new Object[] { "change", AddLocalizedEnumValueChange.builder().change("change") },
+                new Object[] { "nextValue", AddLocalizedEnumValueChange.builder()
                         .nextValue(new com.commercetools.history.models.common.AttributeLocalizedEnumValueImpl()) },
-                new Object[] { AddLocalizedEnumValueChange.builder().fieldName("fieldName") },
-                new Object[] { AddLocalizedEnumValueChange.builder().attributeName("attributeName") } };
+                new Object[] { "fieldName", AddLocalizedEnumValueChange.builder().fieldName("fieldName") },
+                new Object[] { "attributeName",
+                        AddLocalizedEnumValueChange.builder().attributeName("attributeName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocationChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocationChangeTest.java
index 82fe2fb991a..aeede089ca4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocationChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocationChangeTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddLocationChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddLocationChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddLocationChangeBuilder builder) {
         AddLocationChange addLocationChange = builder.buildUnchecked();
         Assertions.assertThat(addLocationChange).isInstanceOf(AddLocationChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddLocationChange.builder().change("change") }, new Object[] {
+        return new Object[][] { new Object[] { "change", AddLocationChange.builder().change("change") }, new Object[] {
+                "nextValue",
                 AddLocationChange.builder().nextValue(new com.commercetools.history.models.common.LocationImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddOrderLineItemChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddOrderLineItemChangeTest.java
index c6e850c0166..bdbbc321ccc 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddOrderLineItemChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddOrderLineItemChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddOrderLineItemChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddOrderLineItemChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddOrderLineItemChangeBuilder builder) {
         AddOrderLineItemChange addOrderLineItemChange = builder.buildUnchecked();
         Assertions.assertThat(addOrderLineItemChange).isInstanceOf(AddOrderLineItemChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddOrderLineItemChange.builder().change("change") },
-                new Object[] { AddOrderLineItemChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LineItemImpl()) },
-                new Object[] { AddOrderLineItemChange.builder()
+        return new Object[][] { new Object[] { "change", AddOrderLineItemChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        AddOrderLineItemChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LineItemImpl()) },
+                new Object[] { "nextValue", AddOrderLineItemChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddParcelToDeliveryChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddParcelToDeliveryChangeTest.java
index 3f7b2e619b5..2dfc3a1d211 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddParcelToDeliveryChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddParcelToDeliveryChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddParcelToDeliveryChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddParcelToDeliveryChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddParcelToDeliveryChangeBuilder builder) {
         AddParcelToDeliveryChange addParcelToDeliveryChange = builder.buildUnchecked();
         Assertions.assertThat(addParcelToDeliveryChange).isInstanceOf(AddParcelToDeliveryChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddParcelToDeliveryChange.builder().change("change") },
-                new Object[] { AddParcelToDeliveryChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.ParcelImpl()) },
-                new Object[] { AddParcelToDeliveryChange.builder().deliveryId("deliveryId") } };
+        return new Object[][] { new Object[] { "change", AddParcelToDeliveryChange.builder().change("change") },
+                new Object[] { "nextValue",
+                        AddParcelToDeliveryChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.ParcelImpl()) },
+                new Object[] { "deliveryId", AddParcelToDeliveryChange.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPaymentChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPaymentChangeTest.java
index af8edf8790c..c3a6c7a306a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPaymentChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPaymentChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddPaymentChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddPaymentChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddPaymentChangeBuilder builder) {
         AddPaymentChange addPaymentChange = builder.buildUnchecked();
         Assertions.assertThat(addPaymentChange).isInstanceOf(AddPaymentChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddPaymentChange.builder().change("change") },
-                new Object[] { AddPaymentChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.PaymentInfoImpl()) },
-                new Object[] { AddPaymentChange.builder()
+        return new Object[][] { new Object[] { "change", AddPaymentChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        AddPaymentChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.PaymentInfoImpl()) },
+                new Object[] { "nextValue", AddPaymentChange.builder()
                         .nextValue(new com.commercetools.history.models.common.PaymentInfoImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeTest.java
index 9ff564f8433..8007029a6da 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddPlainEnumValueChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddPlainEnumValueChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddPlainEnumValueChangeBuilder builder) {
         AddPlainEnumValueChange addPlainEnumValueChange = builder.buildUnchecked();
         Assertions.assertThat(addPlainEnumValueChange).isInstanceOf(AddPlainEnumValueChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddPlainEnumValueChange.builder().change("change") },
-                new Object[] { AddPlainEnumValueChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.AttributePlainEnumValueImpl()) },
-                new Object[] { AddPlainEnumValueChange.builder().attributeName("attributeName") } };
+        return new Object[][] { new Object[] { "change", AddPlainEnumValueChange.builder().change("change") },
+                new Object[] { "nextValue",
+                        AddPlainEnumValueChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.AttributePlainEnumValueImpl()) },
+                new Object[] { "attributeName", AddPlainEnumValueChange.builder().attributeName("attributeName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPriceChangeTest.java
index 6d4d45b83a1..3c6bca5d3fb 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPriceChangeTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddPriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddPriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddPriceChangeBuilder builder) {
         AddPriceChange addPriceChange = builder.buildUnchecked();
         Assertions.assertThat(addPriceChange).isInstanceOf(AddPriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddPriceChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", AddPriceChange.builder().change("change") },
+                new Object[] { "nextValue",
                         AddPriceChange.builder().nextValue(new com.commercetools.history.models.common.PriceImpl()) },
-                new Object[] { AddPriceChange.builder().catalogData("catalogData") },
-                new Object[] { AddPriceChange.builder().priceId("priceId") } };
+                new Object[] { "catalogData", AddPriceChange.builder().catalogData("catalogData") },
+                new Object[] { "priceId", AddPriceChange.builder().priceId("priceId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddProductChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddProductChangeTest.java
index f23021d78a5..5510ee2cc4c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddProductChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddProductChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddProductChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddProductChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddProductChangeBuilder builder) {
         AddProductChange addProductChange = builder.buildUnchecked();
         Assertions.assertThat(addProductChange).isInstanceOf(AddProductChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddProductChange.builder().change("change") },
-                new Object[] { AddProductChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { AddProductChange.builder()
-                        .variantSelection(
-                            new com.commercetools.history.models.common.ProductVariantSelectionImpl()) } };
+        return new Object[][] { new Object[] { "change", AddProductChange.builder().change("change") },
+                new Object[] { "nextValue",
+                        AddProductChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "variantSelection",
+                        AddProductChange.builder()
+                                .variantSelection(
+                                    new com.commercetools.history.models.common.ProductVariantSelectionImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddProductSelectionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddProductSelectionChangeTest.java
index 0e78d4cb9d3..847dc53678d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddProductSelectionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddProductSelectionChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddProductSelectionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddProductSelectionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddProductSelectionChangeBuilder builder) {
         AddProductSelectionChange addProductSelectionChange = builder.buildUnchecked();
         Assertions.assertThat(addProductSelectionChange).isInstanceOf(AddProductSelectionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddProductSelectionChange.builder().change("change") },
-                new Object[] { AddProductSelectionChange.builder()
+        return new Object[][] { new Object[] { "change", AddProductSelectionChange.builder().change("change") },
+                new Object[] { "previousValue", AddProductSelectionChange.builder()
                         .previousValue(new com.commercetools.history.models.common.ProductSelectionSettingImpl()) },
-                new Object[] { AddProductSelectionChange.builder()
+                new Object[] { "nextValue", AddProductSelectionChange.builder()
                         .nextValue(new com.commercetools.history.models.common.ProductSelectionSettingImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPropertyChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPropertyChangeTest.java
index 0ee914cefed..327a27f506a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPropertyChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPropertyChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddPropertyChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddPropertyChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddPropertyChangeBuilder builder) {
         AddPropertyChange addPropertyChange = builder.buildUnchecked();
         Assertions.assertThat(addPropertyChange).isInstanceOf(AddPropertyChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddPropertyChange.builder().change("change") },
-                new Object[] { AddPropertyChange.builder().nextValue("nextValue") },
-                new Object[] { AddPropertyChange.builder().path("path") } };
+        return new Object[][] { new Object[] { "change", AddPropertyChange.builder().change("change") },
+                new Object[] { "nextValue", AddPropertyChange.builder().nextValue("nextValue") },
+                new Object[] { "path", AddPropertyChange.builder().path("path") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddReturnInfoChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddReturnInfoChangeTest.java
index 18d057c7c50..9f625ccedc5 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddReturnInfoChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddReturnInfoChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddReturnInfoChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddReturnInfoChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddReturnInfoChangeBuilder builder) {
         AddReturnInfoChange addReturnInfoChange = builder.buildUnchecked();
         Assertions.assertThat(addReturnInfoChange).isInstanceOf(AddReturnInfoChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddReturnInfoChange.builder().change("change") },
-                new Object[] { AddReturnInfoChange.builder()
+        return new Object[][] { new Object[] { "change", AddReturnInfoChange.builder().change("change") },
+                new Object[] { "nextValue", AddReturnInfoChange.builder()
                         .nextValue(new com.commercetools.history.models.common.ReturnInfoImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddShippingAddressIdChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddShippingAddressIdChangeTest.java
index a42634e36af..1abdf95d502 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddShippingAddressIdChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddShippingAddressIdChangeTest.java
@@ -3,34 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddShippingAddressIdChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddShippingAddressIdChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddShippingAddressIdChangeBuilder builder) {
         AddShippingAddressIdChange addShippingAddressIdChange = builder.buildUnchecked();
         Assertions.assertThat(addShippingAddressIdChange).isInstanceOf(AddShippingAddressIdChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddShippingAddressIdChange.builder().change("change") },
-                new Object[] { AddShippingAddressIdChange.builder()
-                        .previousValue(Collections.singletonList("previousValue")) },
-                new Object[] { AddShippingAddressIdChange.builder().nextValue(Collections.singletonList("nextValue")) },
-                new Object[] { AddShippingAddressIdChange.builder()
+        return new Object[][] { new Object[] { "change", AddShippingAddressIdChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        AddShippingAddressIdChange.builder()
+                                .previousValue(Collections.singletonList("previousValue")) },
+                new Object[] { "nextValue",
+                        AddShippingAddressIdChange.builder().nextValue(Collections.singletonList("nextValue")) },
+                new Object[] { "address", AddShippingAddressIdChange.builder()
                         .address(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddShoppingListLineItemChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddShoppingListLineItemChangeTest.java
index c1c47c7b9a6..fee8b41bb2f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddShoppingListLineItemChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddShoppingListLineItemChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddShoppingListLineItemChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddShoppingListLineItemChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddShoppingListLineItemChangeBuilder builder) {
         AddShoppingListLineItemChange addShoppingListLineItemChange = builder.buildUnchecked();
         Assertions.assertThat(addShoppingListLineItemChange).isInstanceOf(AddShoppingListLineItemChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddShoppingListLineItemChange.builder().change("change") },
-                new Object[] { AddShoppingListLineItemChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LineItemImpl()) },
-                new Object[] { AddShoppingListLineItemChange.builder()
+        return new Object[][] { new Object[] { "change", AddShoppingListLineItemChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        AddShoppingListLineItemChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LineItemImpl()) },
+                new Object[] { "nextValue", AddShoppingListLineItemChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddStateRolesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddStateRolesChangeTest.java
index b40639b2075..e324834d06e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddStateRolesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddStateRolesChangeTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddStateRolesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddStateRolesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddStateRolesChangeBuilder builder) {
         AddStateRolesChange addStateRolesChange = builder.buildUnchecked();
         Assertions.assertThat(addStateRolesChange).isInstanceOf(AddStateRolesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddStateRolesChange.builder().change("change") },
-                new Object[] { AddStateRolesChange.builder()
+        return new Object[][] { new Object[] { "change", AddStateRolesChange.builder().change("change") },
+                new Object[] { "previousValue", AddStateRolesChange.builder()
                         .previousValue(Collections.singletonList(com.commercetools.history.models.common.StateRoleEnum
                                 .findEnum("ReviewIncludedInStatistics"))) },
-                new Object[] { AddStateRolesChange.builder()
+                new Object[] { "nextValue", AddStateRolesChange.builder()
                         .nextValue(Collections.singletonList(com.commercetools.history.models.common.StateRoleEnum
                                 .findEnum("ReviewIncludedInStatistics"))) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddTaxRateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddTaxRateChangeTest.java
index b0a10b7b291..da835b4ec18 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddTaxRateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddTaxRateChangeTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddTaxRateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddTaxRateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddTaxRateChangeBuilder builder) {
         AddTaxRateChange addTaxRateChange = builder.buildUnchecked();
         Assertions.assertThat(addTaxRateChange).isInstanceOf(AddTaxRateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddTaxRateChange.builder().change("change") }, new Object[] {
+        return new Object[][] { new Object[] { "change", AddTaxRateChange.builder().change("change") }, new Object[] {
+                "nextValue",
                 AddTaxRateChange.builder().nextValue(new com.commercetools.history.models.common.TaxRateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddTextLineItemChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddTextLineItemChangeTest.java
index ba184dfef35..ab9d22a302a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddTextLineItemChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddTextLineItemChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddTextLineItemChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddTextLineItemChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddTextLineItemChangeBuilder builder) {
         AddTextLineItemChange addTextLineItemChange = builder.buildUnchecked();
         Assertions.assertThat(addTextLineItemChange).isInstanceOf(AddTextLineItemChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddTextLineItemChange.builder().change("change") },
-                new Object[] { AddTextLineItemChange.builder()
+        return new Object[][] { new Object[] { "change", AddTextLineItemChange.builder().change("change") },
+                new Object[] { "nextValue", AddTextLineItemChange.builder()
                         .nextValue(new com.commercetools.history.models.common.TextLineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddToCategoryChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddToCategoryChangeTest.java
index a23f78f5993..2ba6c3d9314 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddToCategoryChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddToCategoryChangeTest.java
@@ -3,39 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddToCategoryChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddToCategoryChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddToCategoryChangeBuilder builder) {
         AddToCategoryChange addToCategoryChange = builder.buildUnchecked();
         Assertions.assertThat(addToCategoryChange).isInstanceOf(AddToCategoryChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddToCategoryChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", AddToCategoryChange.builder().change("change") },
+                new Object[] { "previousValue",
                         AddToCategoryChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ReferenceImpl())) },
-                new Object[] {
+                new Object[] { "nextValue",
                         AddToCategoryChange.builder()
                                 .nextValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ReferenceImpl())) },
-                new Object[] { AddToCategoryChange.builder()
+                new Object[] { "category", AddToCategoryChange.builder()
                         .category(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddTransactionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddTransactionChangeTest.java
index 1adf4066f84..9faafab6716 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddTransactionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddTransactionChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddTransactionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddTransactionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddTransactionChangeBuilder builder) {
         AddTransactionChange addTransactionChange = builder.buildUnchecked();
         Assertions.assertThat(addTransactionChange).isInstanceOf(AddTransactionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddTransactionChange.builder().change("change") },
-                new Object[] { AddTransactionChange.builder()
+        return new Object[][] { new Object[] { "change", AddTransactionChange.builder().change("change") },
+                new Object[] { "nextValue", AddTransactionChange.builder()
                         .nextValue(new com.commercetools.history.models.common.TransactionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddVariantChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddVariantChangeTest.java
index 938e421d25b..e4776653772 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddVariantChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddVariantChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddVariantChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddVariantChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddVariantChangeBuilder builder) {
         AddVariantChange addVariantChange = builder.buildUnchecked();
         Assertions.assertThat(addVariantChange).isInstanceOf(AddVariantChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddVariantChange.builder().change("change") },
-                new Object[] { AddVariantChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.VariantImpl()) },
-                new Object[] { AddVariantChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.VariantImpl()) },
-                new Object[] { AddVariantChange.builder().catalogData("catalogData") } };
+        return new Object[][] { new Object[] { "change", AddVariantChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        AddVariantChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.VariantImpl()) },
+                new Object[] { "nextValue",
+                        AddVariantChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.VariantImpl()) },
+                new Object[] { "catalogData", AddVariantChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAddressChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAddressChangeTest.java
index 2367ec4d36c..62592162cd5 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAddressChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAddressChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeAddressChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeAddressChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeAddressChangeBuilder builder) {
         ChangeAddressChange changeAddressChange = builder.buildUnchecked();
         Assertions.assertThat(changeAddressChange).isInstanceOf(ChangeAddressChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeAddressChange.builder().change("change") },
-                new Object[] { ChangeAddressChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { ChangeAddressChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeAddressChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeAddressChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "nextValue", ChangeAddressChange.builder()
                         .nextValue(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAmountAuthorizedChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAmountAuthorizedChangeTest.java
index 1d41e6d9b99..f34c1b40c2c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAmountAuthorizedChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAmountAuthorizedChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeAmountAuthorizedChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeAmountAuthorizedChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeAmountAuthorizedChangeBuilder builder) {
         ChangeAmountAuthorizedChange changeAmountAuthorizedChange = builder.buildUnchecked();
         Assertions.assertThat(changeAmountAuthorizedChange).isInstanceOf(ChangeAmountAuthorizedChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeAmountAuthorizedChange.builder().change("change") },
-                new Object[] { ChangeAmountAuthorizedChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { ChangeAmountAuthorizedChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeAmountAuthorizedChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeAmountAuthorizedChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "nextValue", ChangeAmountAuthorizedChange.builder()
                         .nextValue(new com.commercetools.history.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAmountPlannedChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAmountPlannedChangeTest.java
index fff84833dff..87d4262b598 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAmountPlannedChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAmountPlannedChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeAmountPlannedChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeAmountPlannedChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeAmountPlannedChangeBuilder builder) {
         ChangeAmountPlannedChange changeAmountPlannedChange = builder.buildUnchecked();
         Assertions.assertThat(changeAmountPlannedChange).isInstanceOf(ChangeAmountPlannedChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeAmountPlannedChange.builder().change("change") },
-                new Object[] { ChangeAmountPlannedChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { ChangeAmountPlannedChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeAmountPlannedChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeAmountPlannedChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "nextValue", ChangeAmountPlannedChange.builder()
                         .nextValue(new com.commercetools.history.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssetNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssetNameChangeTest.java
index 30e80e2dd3d..d4871f1d522 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssetNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssetNameChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeAssetNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeAssetNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeAssetNameChangeBuilder builder) {
         ChangeAssetNameChange changeAssetNameChange = builder.buildUnchecked();
         Assertions.assertThat(changeAssetNameChange).isInstanceOf(ChangeAssetNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeAssetNameChange.builder().change("change") },
-                new Object[] { ChangeAssetNameChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeAssetNameChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeAssetNameChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeAssetNameChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeAssetNameChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue",
+                        ChangeAssetNameChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "asset", ChangeAssetNameChange.builder()
                         .asset(new com.commercetools.history.models.change_value.AssetChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssetOrderChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssetOrderChangeTest.java
index e1a09adccbe..07da6bdbdce 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssetOrderChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssetOrderChangeTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeAssetOrderChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeAssetOrderChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeAssetOrderChangeBuilder builder) {
         ChangeAssetOrderChange changeAssetOrderChange = builder.buildUnchecked();
         Assertions.assertThat(changeAssetOrderChange).isInstanceOf(ChangeAssetOrderChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeAssetOrderChange.builder().change("change") },
-                new Object[] { ChangeAssetOrderChange.builder()
-                        .previousValue(Collections
-                                .singletonList(new com.commercetools.history.models.common.LocalizedStringImpl())) },
-                new Object[] { ChangeAssetOrderChange.builder()
-                        .nextValue(Collections
-                                .singletonList(new com.commercetools.history.models.common.LocalizedStringImpl())) } };
+        return new Object[][] { new Object[] { "change", ChangeAssetOrderChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeAssetOrderChange.builder()
+                                .previousValue(Collections.singletonList(
+                                    new com.commercetools.history.models.common.LocalizedStringImpl())) },
+                new Object[] { "nextValue",
+                        ChangeAssetOrderChange.builder()
+                                .nextValue(Collections.singletonList(
+                                    new com.commercetools.history.models.common.LocalizedStringImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssociateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssociateChangeTest.java
index f173a24d054..4602b270a11 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssociateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssociateChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeAssociateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeAssociateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeAssociateChangeBuilder builder) {
         ChangeAssociateChange changeAssociateChange = builder.buildUnchecked();
         Assertions.assertThat(changeAssociateChange).isInstanceOf(ChangeAssociateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeAssociateChange.builder().change("change") },
-                new Object[] { ChangeAssociateChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.AssociateImpl()) },
-                new Object[] { ChangeAssociateChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeAssociateChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeAssociateChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.AssociateImpl()) },
+                new Object[] { "nextValue", ChangeAssociateChange.builder()
                         .nextValue(new com.commercetools.history.models.common.AssociateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssociateModeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssociateModeChangeTest.java
index e07dc570328..cb5a1cd4f08 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssociateModeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAssociateModeChangeTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeAssociateModeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeAssociateModeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeAssociateModeChangeBuilder builder) {
         ChangeAssociateModeChange changeAssociateModeChange = builder.buildUnchecked();
         Assertions.assertThat(changeAssociateModeChange).isInstanceOf(ChangeAssociateModeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeAssociateModeChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", ChangeAssociateModeChange.builder().change("change") },
+                new Object[] { "previousValue",
                         ChangeAssociateModeChange.builder()
                                 .previousValue(com.commercetools.history.models.common.BusinessUnitAssociateMode
                                         .findEnum("Explicit")) },
-                new Object[] { ChangeAssociateModeChange.builder()
+                new Object[] { "nextValue", ChangeAssociateModeChange.builder()
                         .nextValue(
                             com.commercetools.history.models.common.BusinessUnitAssociateMode.findEnum("Explicit")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAttributeConstraintChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAttributeConstraintChangeTest.java
index fe004a0ae3b..905dbafdf54 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAttributeConstraintChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAttributeConstraintChangeTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeAttributeConstraintChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeAttributeConstraintChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeAttributeConstraintChangeBuilder builder) {
         ChangeAttributeConstraintChange changeAttributeConstraintChange = builder.buildUnchecked();
         Assertions.assertThat(changeAttributeConstraintChange).isInstanceOf(ChangeAttributeConstraintChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeAttributeConstraintChange.builder().change("change") },
-                new Object[] { ChangeAttributeConstraintChange.builder()
-                        .previousValue(
-                            com.commercetools.history.models.common.AttributeConstraintEnum.findEnum("None")) },
-                new Object[] { ChangeAttributeConstraintChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeAttributeConstraintChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeAttributeConstraintChange.builder()
+                                .previousValue(
+                                    com.commercetools.history.models.common.AttributeConstraintEnum.findEnum("None")) },
+                new Object[] { "nextValue", ChangeAttributeConstraintChange.builder()
                         .nextValue(com.commercetools.history.models.common.AttributeConstraintEnum.findEnum("None")) },
-                new Object[] { ChangeAttributeConstraintChange.builder().attributeName("attributeName") } };
+                new Object[] { "attributeName",
+                        ChangeAttributeConstraintChange.builder().attributeName("attributeName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAttributeOrderByNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAttributeOrderByNameChangeTest.java
index 426bf4ec9a3..9f11a95b859 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAttributeOrderByNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeAttributeOrderByNameChangeTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeAttributeOrderByNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeAttributeOrderByNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeAttributeOrderByNameChangeBuilder builder) {
         ChangeAttributeOrderByNameChange changeAttributeOrderByNameChange = builder.buildUnchecked();
         Assertions.assertThat(changeAttributeOrderByNameChange).isInstanceOf(ChangeAttributeOrderByNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeAttributeOrderByNameChange.builder().change("change") },
-                new Object[] { ChangeAttributeOrderByNameChange.builder()
-                        .previousValue(Collections.singletonList("previousValue")) },
-                new Object[] { ChangeAttributeOrderByNameChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeAttributeOrderByNameChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeAttributeOrderByNameChange.builder()
+                                .previousValue(Collections.singletonList("previousValue")) },
+                new Object[] { "nextValue", ChangeAttributeOrderByNameChange.builder()
                         .nextValue(Collections.singletonList("nextValue")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeBuyerAssignableChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeBuyerAssignableChangeTest.java
index e72d3bb305e..149ce18b633 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeBuyerAssignableChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeBuyerAssignableChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeBuyerAssignableChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeBuyerAssignableChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeBuyerAssignableChangeBuilder builder) {
         ChangeBuyerAssignableChange changeBuyerAssignableChange = builder.buildUnchecked();
         Assertions.assertThat(changeBuyerAssignableChange).isInstanceOf(ChangeBuyerAssignableChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeBuyerAssignableChange.builder().change("change") },
-                new Object[] { ChangeBuyerAssignableChange.builder().previousValue(true) },
-                new Object[] { ChangeBuyerAssignableChange.builder().nextValue(true) } };
+        return new Object[][] { new Object[] { "change", ChangeBuyerAssignableChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeBuyerAssignableChange.builder().previousValue(true) },
+                new Object[] { "nextValue", ChangeBuyerAssignableChange.builder().nextValue(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeCartDiscountsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeCartDiscountsChangeTest.java
index 38cc39c7f9f..e699a4d2f26 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeCartDiscountsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeCartDiscountsChangeTest.java
@@ -3,35 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeCartDiscountsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeCartDiscountsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeCartDiscountsChangeBuilder builder) {
         ChangeCartDiscountsChange changeCartDiscountsChange = builder.buildUnchecked();
         Assertions.assertThat(changeCartDiscountsChange).isInstanceOf(ChangeCartDiscountsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeCartDiscountsChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", ChangeCartDiscountsChange.builder().change("change") },
+                new Object[] { "previousValue",
                         ChangeCartDiscountsChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ReferenceImpl())) },
-                new Object[] { ChangeCartDiscountsChange.builder()
+                new Object[] { "nextValue", ChangeCartDiscountsChange.builder()
                         .nextValue(
                             Collections.singletonList(new com.commercetools.history.models.common.ReferenceImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeCartPredicateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeCartPredicateChangeTest.java
index d5f871d0ffb..e1ccc32bcf2 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeCartPredicateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeCartPredicateChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeCartPredicateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeCartPredicateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeCartPredicateChangeBuilder builder) {
         ChangeCartPredicateChange changeCartPredicateChange = builder.buildUnchecked();
         Assertions.assertThat(changeCartPredicateChange).isInstanceOf(ChangeCartPredicateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeCartPredicateChange.builder().change("change") },
-                new Object[] { ChangeCartPredicateChange.builder().previousValue("previousValue") },
-                new Object[] { ChangeCartPredicateChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", ChangeCartPredicateChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeCartPredicateChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", ChangeCartPredicateChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeCustomLineItemQuantityChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeCustomLineItemQuantityChangeTest.java
index 7da3aa15b01..da29d5fb18b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeCustomLineItemQuantityChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeCustomLineItemQuantityChangeTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeCustomLineItemQuantityChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeCustomLineItemQuantityChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeCustomLineItemQuantityChangeBuilder builder) {
         ChangeCustomLineItemQuantityChange changeCustomLineItemQuantityChange = builder.buildUnchecked();
         Assertions.assertThat(changeCustomLineItemQuantityChange)
                 .isInstanceOf(ChangeCustomLineItemQuantityChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeCustomLineItemQuantityChange.builder().change("change") },
-                new Object[] { ChangeCustomLineItemQuantityChange.builder().previousValue(8) },
-                new Object[] { ChangeCustomLineItemQuantityChange.builder().nextValue(7) },
-                new Object[] { ChangeCustomLineItemQuantityChange.builder()
-                        .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeCustomLineItemQuantityChange.builder().customLineItemId("customLineItemId") } };
+        return new Object[][] {
+                new Object[] { "change", ChangeCustomLineItemQuantityChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeCustomLineItemQuantityChange.builder().previousValue(8) },
+                new Object[] { "nextValue", ChangeCustomLineItemQuantityChange.builder().nextValue(7) },
+                new Object[] { "customLineItem",
+                        ChangeCustomLineItemQuantityChange.builder()
+                                .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "customLineItemId",
+                        ChangeCustomLineItemQuantityChange.builder().customLineItemId("customLineItemId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeDescriptionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeDescriptionChangeTest.java
index 7cef9f2c238..503079222fc 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeDescriptionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeDescriptionChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeDescriptionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeDescriptionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeDescriptionChangeBuilder builder) {
         ChangeDescriptionChange changeDescriptionChange = builder.buildUnchecked();
         Assertions.assertThat(changeDescriptionChange).isInstanceOf(ChangeDescriptionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeDescriptionChange.builder().change("change") },
-                new Object[] { ChangeDescriptionChange.builder().previousValue("previousValue") },
-                new Object[] { ChangeDescriptionChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", ChangeDescriptionChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeDescriptionChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", ChangeDescriptionChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeEmailChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeEmailChangeTest.java
index 1587f7e432d..9c70de8f27d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeEmailChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeEmailChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeEmailChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeEmailChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeEmailChangeBuilder builder) {
         ChangeEmailChange changeEmailChange = builder.buildUnchecked();
         Assertions.assertThat(changeEmailChange).isInstanceOf(ChangeEmailChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeEmailChange.builder().change("change") },
-                new Object[] { ChangeEmailChange.builder().previousValue("previousValue") },
-                new Object[] { ChangeEmailChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", ChangeEmailChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeEmailChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", ChangeEmailChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeEnumValueLabelChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeEnumValueLabelChangeTest.java
index 027c0a4bc3c..b053c7e21ef 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeEnumValueLabelChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeEnumValueLabelChangeTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeEnumValueLabelChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeEnumValueLabelChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeEnumValueLabelChangeBuilder builder) {
         ChangeEnumValueLabelChange changeEnumValueLabelChange = builder.buildUnchecked();
         Assertions.assertThat(changeEnumValueLabelChange).isInstanceOf(ChangeEnumValueLabelChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeEnumValueLabelChange.builder().change("change") },
-                new Object[] { ChangeEnumValueLabelChange.builder().previousValue("previousValue") },
-                new Object[] { ChangeEnumValueLabelChange.builder().nextValue("nextValue") },
-                new Object[] { ChangeEnumValueLabelChange.builder().fieldName("fieldName") },
-                new Object[] { ChangeEnumValueLabelChange.builder().valueKey("valueKey") } };
+        return new Object[][] { new Object[] { "change", ChangeEnumValueLabelChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeEnumValueLabelChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", ChangeEnumValueLabelChange.builder().nextValue("nextValue") },
+                new Object[] { "fieldName", ChangeEnumValueLabelChange.builder().fieldName("fieldName") },
+                new Object[] { "valueKey", ChangeEnumValueLabelChange.builder().valueKey("valueKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeEnumValueOrderChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeEnumValueOrderChangeTest.java
index 4e3c101b298..7c376c8d176 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeEnumValueOrderChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeEnumValueOrderChangeTest.java
@@ -3,37 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeEnumValueOrderChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeEnumValueOrderChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeEnumValueOrderChangeBuilder builder) {
         ChangeEnumValueOrderChange changeEnumValueOrderChange = builder.buildUnchecked();
         Assertions.assertThat(changeEnumValueOrderChange).isInstanceOf(ChangeEnumValueOrderChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeEnumValueOrderChange.builder().change("change") },
-                new Object[] { ChangeEnumValueOrderChange.builder()
-                        .previousValue(Collections
-                                .singletonList(new com.commercetools.history.models.change_value.EnumValueImpl())) },
-                new Object[] { ChangeEnumValueOrderChange.builder()
-                        .nextValue(Collections
-                                .singletonList(new com.commercetools.history.models.change_value.EnumValueImpl())) },
-                new Object[] { ChangeEnumValueOrderChange.builder().fieldName("fieldName") } };
+        return new Object[][] { new Object[] { "change", ChangeEnumValueOrderChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeEnumValueOrderChange.builder()
+                                .previousValue(Collections.singletonList(
+                                    new com.commercetools.history.models.change_value.EnumValueImpl())) },
+                new Object[] { "nextValue",
+                        ChangeEnumValueOrderChange.builder()
+                                .nextValue(Collections.singletonList(
+                                    new com.commercetools.history.models.change_value.EnumValueImpl())) },
+                new Object[] { "fieldName", ChangeEnumValueOrderChange.builder().fieldName("fieldName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeFieldDefinitionOrderChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeFieldDefinitionOrderChangeTest.java
index 80976f613f1..709db10ab0f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeFieldDefinitionOrderChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeFieldDefinitionOrderChangeTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeFieldDefinitionOrderChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeFieldDefinitionOrderChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeFieldDefinitionOrderChangeBuilder builder) {
         ChangeFieldDefinitionOrderChange changeFieldDefinitionOrderChange = builder.buildUnchecked();
         Assertions.assertThat(changeFieldDefinitionOrderChange).isInstanceOf(ChangeFieldDefinitionOrderChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeFieldDefinitionOrderChange.builder().change("change") },
-                new Object[] { ChangeFieldDefinitionOrderChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeFieldDefinitionOrderChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeFieldDefinitionOrderChange.builder()
                         .previousValue(Collections.singletonList(
                             new com.commercetools.history.models.change_value.FieldDefinitionOrderValueImpl())) },
-                new Object[] { ChangeFieldDefinitionOrderChange.builder()
+                new Object[] { "nextValue", ChangeFieldDefinitionOrderChange.builder()
                         .nextValue(Collections.singletonList(
                             new com.commercetools.history.models.change_value.FieldDefinitionOrderValueImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeGroupsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeGroupsChangeTest.java
index 83f92f3f5fb..3e10eefa43e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeGroupsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeGroupsChangeTest.java
@@ -3,32 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeGroupsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeGroupsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeGroupsChangeBuilder builder) {
         ChangeGroupsChange changeGroupsChange = builder.buildUnchecked();
         Assertions.assertThat(changeGroupsChange).isInstanceOf(ChangeGroupsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeGroupsChange.builder().change("change") },
-                new Object[] { ChangeGroupsChange.builder().previousValue(Collections.singletonList("previousValue")) },
-                new Object[] { ChangeGroupsChange.builder().nextValue(Collections.singletonList("nextValue")) } };
+        return new Object[][] { new Object[] { "change", ChangeGroupsChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeGroupsChange.builder().previousValue(Collections.singletonList("previousValue")) },
+                new Object[] { "nextValue",
+                        ChangeGroupsChange.builder().nextValue(Collections.singletonList("nextValue")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeInheritedAssociateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeInheritedAssociateChangeTest.java
index 33623e1c205..9c372c27b78 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeInheritedAssociateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeInheritedAssociateChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeInheritedAssociateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeInheritedAssociateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeInheritedAssociateChangeBuilder builder) {
         ChangeInheritedAssociateChange changeInheritedAssociateChange = builder.buildUnchecked();
         Assertions.assertThat(changeInheritedAssociateChange).isInstanceOf(ChangeInheritedAssociateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeInheritedAssociateChange.builder().change("change") },
-                new Object[] { ChangeInheritedAssociateChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.InheritedAssociateImpl()) },
-                new Object[] { ChangeInheritedAssociateChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeInheritedAssociateChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeInheritedAssociateChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.InheritedAssociateImpl()) },
+                new Object[] { "nextValue", ChangeInheritedAssociateChange.builder()
                         .nextValue(new com.commercetools.history.models.common.InheritedAssociateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeInitialChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeInitialChangeTest.java
index cd1d55e63a8..004186e8417 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeInitialChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeInitialChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeInitialChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeInitialChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeInitialChangeBuilder builder) {
         ChangeInitialChange changeInitialChange = builder.buildUnchecked();
         Assertions.assertThat(changeInitialChange).isInstanceOf(ChangeInitialChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeInitialChange.builder().change("change") },
-                new Object[] { ChangeInitialChange.builder().previousValue(true) },
-                new Object[] { ChangeInitialChange.builder().nextValue(true) } };
+        return new Object[][] { new Object[] { "change", ChangeInitialChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeInitialChange.builder().previousValue(true) },
+                new Object[] { "nextValue", ChangeInitialChange.builder().nextValue(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeInputHintChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeInputHintChangeTest.java
index 8b1d9d9c1af..1d9cc702434 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeInputHintChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeInputHintChangeTest.java
@@ -1,36 +1,28 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeInputHintChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeInputHintChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeInputHintChangeBuilder builder) {
         ChangeInputHintChange changeInputHintChange = builder.buildUnchecked();
         Assertions.assertThat(changeInputHintChange).isInstanceOf(ChangeInputHintChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeInputHintChange.builder().change("change") },
-                new Object[] { ChangeInputHintChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeInputHintChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeInputHintChange.builder()
                         .previousValue(com.commercetools.history.models.common.TextInputHint.findEnum("SingleLine")) },
-                new Object[] { ChangeInputHintChange.builder()
+                new Object[] { "nextValue", ChangeInputHintChange.builder()
                         .nextValue(com.commercetools.history.models.common.TextInputHint.findEnum("SingleLine")) },
-                new Object[] { ChangeInputHintChange.builder().fieldName("fieldName") },
-                new Object[] { ChangeInputHintChange.builder().attributeName("attributeName") } };
+                new Object[] { "fieldName", ChangeInputHintChange.builder().fieldName("fieldName") },
+                new Object[] { "attributeName", ChangeInputHintChange.builder().attributeName("attributeName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeIsActiveChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeIsActiveChangeTest.java
index 097ea262f94..4f8c3b65eec 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeIsActiveChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeIsActiveChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeIsActiveChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeIsActiveChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeIsActiveChangeBuilder builder) {
         ChangeIsActiveChange changeIsActiveChange = builder.buildUnchecked();
         Assertions.assertThat(changeIsActiveChange).isInstanceOf(ChangeIsActiveChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeIsActiveChange.builder().change("change") },
-                new Object[] { ChangeIsActiveChange.builder().previousValue(true) },
-                new Object[] { ChangeIsActiveChange.builder().nextValue(true) } };
+        return new Object[][] { new Object[] { "change", ChangeIsActiveChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeIsActiveChange.builder().previousValue(true) },
+                new Object[] { "nextValue", ChangeIsActiveChange.builder().nextValue(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeIsSearchableChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeIsSearchableChangeTest.java
index 242fa0ba591..e6585e93967 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeIsSearchableChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeIsSearchableChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeIsSearchableChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeIsSearchableChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeIsSearchableChangeBuilder builder) {
         ChangeIsSearchableChange changeIsSearchableChange = builder.buildUnchecked();
         Assertions.assertThat(changeIsSearchableChange).isInstanceOf(ChangeIsSearchableChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeIsSearchableChange.builder().change("change") },
-                new Object[] { ChangeIsSearchableChange.builder().previousValue(true) },
-                new Object[] { ChangeIsSearchableChange.builder().nextValue(true) },
-                new Object[] { ChangeIsSearchableChange.builder().attributeName("attributeName") } };
+        return new Object[][] { new Object[] { "change", ChangeIsSearchableChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeIsSearchableChange.builder().previousValue(true) },
+                new Object[] { "nextValue", ChangeIsSearchableChange.builder().nextValue(true) },
+                new Object[] { "attributeName", ChangeIsSearchableChange.builder().attributeName("attributeName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeKeyChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeKeyChangeTest.java
index f74eb065741..58133dedfe3 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeKeyChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeKeyChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeKeyChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeKeyChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeKeyChangeBuilder builder) {
         ChangeKeyChange changeKeyChange = builder.buildUnchecked();
         Assertions.assertThat(changeKeyChange).isInstanceOf(ChangeKeyChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeKeyChange.builder().change("change") },
-                new Object[] { ChangeKeyChange.builder().previousValue("previousValue") },
-                new Object[] { ChangeKeyChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", ChangeKeyChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeKeyChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", ChangeKeyChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLabelChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLabelChangeTest.java
index e191b426512..b15fc834d14 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLabelChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLabelChangeTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeLabelChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeLabelChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeLabelChangeBuilder builder) {
         ChangeLabelChange changeLabelChange = builder.buildUnchecked();
         Assertions.assertThat(changeLabelChange).isInstanceOf(ChangeLabelChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeLabelChange.builder().change("change") },
-                new Object[] { ChangeLabelChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeLabelChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeLabelChange.builder().fieldName("fieldName") },
-                new Object[] { ChangeLabelChange.builder().attributeName("attributeName") } };
+        return new Object[][] { new Object[] { "change", ChangeLabelChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeLabelChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue",
+                        ChangeLabelChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "fieldName", ChangeLabelChange.builder().fieldName("fieldName") },
+                new Object[] { "attributeName", ChangeLabelChange.builder().attributeName("attributeName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLineItemQuantityChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLineItemQuantityChangeTest.java
index 261b3f82766..21a6d6a1054 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLineItemQuantityChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLineItemQuantityChangeTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeLineItemQuantityChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeLineItemQuantityChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeLineItemQuantityChangeBuilder builder) {
         ChangeLineItemQuantityChange changeLineItemQuantityChange = builder.buildUnchecked();
         Assertions.assertThat(changeLineItemQuantityChange).isInstanceOf(ChangeLineItemQuantityChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeLineItemQuantityChange.builder().change("change") },
-                new Object[] { ChangeLineItemQuantityChange.builder().previousValue(8) },
-                new Object[] { ChangeLineItemQuantityChange.builder().nextValue(7) },
-                new Object[] { ChangeLineItemQuantityChange.builder()
-                        .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeLineItemQuantityChange.builder().lineItemId("lineItemId") } };
+        return new Object[][] { new Object[] { "change", ChangeLineItemQuantityChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeLineItemQuantityChange.builder().previousValue(8) },
+                new Object[] { "nextValue", ChangeLineItemQuantityChange.builder().nextValue(7) },
+                new Object[] { "lineItem",
+                        ChangeLineItemQuantityChange.builder()
+                                .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "lineItemId", ChangeLineItemQuantityChange.builder().lineItemId("lineItemId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedDescriptionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedDescriptionChangeTest.java
index 8fa3b7e1b04..0da8e1e0374 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedDescriptionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedDescriptionChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeLocalizedDescriptionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeLocalizedDescriptionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeLocalizedDescriptionChangeBuilder builder) {
         ChangeLocalizedDescriptionChange changeLocalizedDescriptionChange = builder.buildUnchecked();
         Assertions.assertThat(changeLocalizedDescriptionChange).isInstanceOf(ChangeLocalizedDescriptionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeLocalizedDescriptionChange.builder().change("change") },
-                new Object[] { ChangeLocalizedDescriptionChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeLocalizedDescriptionChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeLocalizedDescriptionChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeLocalizedDescriptionChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue", ChangeLocalizedDescriptionChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedEnumValueLabelChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedEnumValueLabelChangeTest.java
index f0fdce14156..56cd81c55c3 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedEnumValueLabelChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedEnumValueLabelChangeTest.java
@@ -1,38 +1,34 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeLocalizedEnumValueLabelChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeLocalizedEnumValueLabelChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeLocalizedEnumValueLabelChangeBuilder builder) {
         ChangeLocalizedEnumValueLabelChange changeLocalizedEnumValueLabelChange = builder.buildUnchecked();
         Assertions.assertThat(changeLocalizedEnumValueLabelChange)
                 .isInstanceOf(ChangeLocalizedEnumValueLabelChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeLocalizedEnumValueLabelChange.builder().change("change") },
-                new Object[] { ChangeLocalizedEnumValueLabelChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeLocalizedEnumValueLabelChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeLocalizedEnumValueLabelChange.builder().fieldName("fieldName") },
-                new Object[] { ChangeLocalizedEnumValueLabelChange.builder().attributeName("attributeName") },
-                new Object[] { ChangeLocalizedEnumValueLabelChange.builder().valueKey("valueKey") } };
+        return new Object[][] {
+                new Object[] { "change", ChangeLocalizedEnumValueLabelChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeLocalizedEnumValueLabelChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue",
+                        ChangeLocalizedEnumValueLabelChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "fieldName", ChangeLocalizedEnumValueLabelChange.builder().fieldName("fieldName") },
+                new Object[] { "attributeName",
+                        ChangeLocalizedEnumValueLabelChange.builder().attributeName("attributeName") },
+                new Object[] { "valueKey", ChangeLocalizedEnumValueLabelChange.builder().valueKey("valueKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedEnumValueOrderChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedEnumValueOrderChangeTest.java
index ecb9da3ca7e..5e20c28cdc7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedEnumValueOrderChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedEnumValueOrderChangeTest.java
@@ -3,39 +3,35 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeLocalizedEnumValueOrderChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeLocalizedEnumValueOrderChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeLocalizedEnumValueOrderChangeBuilder builder) {
         ChangeLocalizedEnumValueOrderChange changeLocalizedEnumValueOrderChange = builder.buildUnchecked();
         Assertions.assertThat(changeLocalizedEnumValueOrderChange)
                 .isInstanceOf(ChangeLocalizedEnumValueOrderChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeLocalizedEnumValueOrderChange.builder().change("change") },
-                new Object[] { ChangeLocalizedEnumValueOrderChange.builder()
-                        .previousValue(Collections.singletonList(
-                            new com.commercetools.history.models.change_value.LocalizedEnumValueImpl())) },
-                new Object[] { ChangeLocalizedEnumValueOrderChange.builder()
-                        .nextValue(Collections.singletonList(
-                            new com.commercetools.history.models.change_value.LocalizedEnumValueImpl())) },
-                new Object[] { ChangeLocalizedEnumValueOrderChange.builder().fieldName("fieldName") },
-                new Object[] { ChangeLocalizedEnumValueOrderChange.builder().attributeName("attributeName") } };
+        return new Object[][] {
+                new Object[] { "change", ChangeLocalizedEnumValueOrderChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeLocalizedEnumValueOrderChange.builder()
+                                .previousValue(Collections.singletonList(
+                                    new com.commercetools.history.models.change_value.LocalizedEnumValueImpl())) },
+                new Object[] { "nextValue",
+                        ChangeLocalizedEnumValueOrderChange.builder()
+                                .nextValue(Collections.singletonList(
+                                    new com.commercetools.history.models.change_value.LocalizedEnumValueImpl())) },
+                new Object[] { "fieldName", ChangeLocalizedEnumValueOrderChange.builder().fieldName("fieldName") },
+                new Object[] { "attributeName",
+                        ChangeLocalizedEnumValueOrderChange.builder().attributeName("attributeName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedNameChangeTest.java
index a2664f347b4..9f432a6889f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeLocalizedNameChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeLocalizedNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeLocalizedNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeLocalizedNameChangeBuilder builder) {
         ChangeLocalizedNameChange changeLocalizedNameChange = builder.buildUnchecked();
         Assertions.assertThat(changeLocalizedNameChange).isInstanceOf(ChangeLocalizedNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeLocalizedNameChange.builder().change("change") },
-                new Object[] { ChangeLocalizedNameChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeLocalizedNameChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeLocalizedNameChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeLocalizedNameChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue", ChangeLocalizedNameChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeMasterVariantChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeMasterVariantChangeTest.java
index 472c7f29e17..826bcfbd84d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeMasterVariantChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeMasterVariantChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeMasterVariantChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeMasterVariantChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeMasterVariantChangeBuilder builder) {
         ChangeMasterVariantChange changeMasterVariantChange = builder.buildUnchecked();
         Assertions.assertThat(changeMasterVariantChange).isInstanceOf(ChangeMasterVariantChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeMasterVariantChange.builder().change("change") },
-                new Object[] { ChangeMasterVariantChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.VariantImpl()) },
-                new Object[] { ChangeMasterVariantChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.VariantImpl()) },
-                new Object[] { ChangeMasterVariantChange.builder().catalogData("catalogData") } };
+        return new Object[][] { new Object[] { "change", ChangeMasterVariantChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeMasterVariantChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.VariantImpl()) },
+                new Object[] { "nextValue",
+                        ChangeMasterVariantChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.VariantImpl()) },
+                new Object[] { "catalogData", ChangeMasterVariantChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeNameChangeTest.java
index 7bdaba576bb..32c1dbc3fc5 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeNameChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeNameChangeBuilder builder) {
         ChangeNameChange changeNameChange = builder.buildUnchecked();
         Assertions.assertThat(changeNameChange).isInstanceOf(ChangeNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeNameChange.builder().change("change") },
-                new Object[] { ChangeNameChange.builder().previousValue("previousValue") },
-                new Object[] { ChangeNameChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", ChangeNameChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeNameChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", ChangeNameChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeOrderHintChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeOrderHintChangeTest.java
index 147e0997946..a68c15b9376 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeOrderHintChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeOrderHintChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeOrderHintChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeOrderHintChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeOrderHintChangeBuilder builder) {
         ChangeOrderHintChange changeOrderHintChange = builder.buildUnchecked();
         Assertions.assertThat(changeOrderHintChange).isInstanceOf(ChangeOrderHintChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeOrderHintChange.builder().change("change") },
-                new Object[] { ChangeOrderHintChange.builder().previousValue("previousValue") },
-                new Object[] { ChangeOrderHintChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", ChangeOrderHintChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeOrderHintChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", ChangeOrderHintChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeOrderStateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeOrderStateChangeTest.java
index ae6a265e3d1..f4e44f76282 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeOrderStateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeOrderStateChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeOrderStateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeOrderStateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeOrderStateChangeBuilder builder) {
         ChangeOrderStateChange changeOrderStateChange = builder.buildUnchecked();
         Assertions.assertThat(changeOrderStateChange).isInstanceOf(ChangeOrderStateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeOrderStateChange.builder().change("change") },
-                new Object[] { ChangeOrderStateChange.builder()
-                        .previousValue(com.commercetools.history.models.common.OrderState.findEnum("Open")) },
-                new Object[] { ChangeOrderStateChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeOrderStateChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeOrderStateChange.builder()
+                                .previousValue(com.commercetools.history.models.common.OrderState.findEnum("Open")) },
+                new Object[] { "nextValue", ChangeOrderStateChange.builder()
                         .nextValue(com.commercetools.history.models.common.OrderState.findEnum("Open")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeParentChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeParentChangeTest.java
index 42303f0d7a7..92db021356b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeParentChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeParentChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeParentChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeParentChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeParentChangeBuilder builder) {
         ChangeParentChange changeParentChange = builder.buildUnchecked();
         Assertions.assertThat(changeParentChange).isInstanceOf(ChangeParentChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeParentChange.builder().change("change") },
-                new Object[] { ChangeParentChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { ChangeParentChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeParentChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeParentChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "nextValue", ChangeParentChange.builder()
                         .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeParentUnitChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeParentUnitChangeTest.java
index 9d2521d317d..df539b0ff73 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeParentUnitChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeParentUnitChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeParentUnitChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeParentUnitChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeParentUnitChangeBuilder builder) {
         ChangeParentUnitChange changeParentUnitChange = builder.buildUnchecked();
         Assertions.assertThat(changeParentUnitChange).isInstanceOf(ChangeParentUnitChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeParentUnitChange.builder().change("change") },
-                new Object[] { ChangeParentUnitChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.KeyReferenceImpl()) },
-                new Object[] { ChangeParentUnitChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeParentUnitChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeParentUnitChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.KeyReferenceImpl()) },
+                new Object[] { "nextValue", ChangeParentUnitChange.builder()
                         .nextValue(new com.commercetools.history.models.common.KeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePaymentStateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePaymentStateChangeTest.java
index c0edfe82796..2121658323b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePaymentStateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePaymentStateChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangePaymentStateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangePaymentStateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangePaymentStateChangeBuilder builder) {
         ChangePaymentStateChange changePaymentStateChange = builder.buildUnchecked();
         Assertions.assertThat(changePaymentStateChange).isInstanceOf(ChangePaymentStateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangePaymentStateChange.builder().change("change") },
-                new Object[] { ChangePaymentStateChange.builder()
+        return new Object[][] { new Object[] { "change", ChangePaymentStateChange.builder().change("change") },
+                new Object[] { "previousValue", ChangePaymentStateChange.builder()
                         .previousValue(com.commercetools.history.models.common.PaymentState.findEnum("BalanceDue")) },
-                new Object[] { ChangePaymentStateChange.builder()
+                new Object[] { "nextValue", ChangePaymentStateChange.builder()
                         .nextValue(com.commercetools.history.models.common.PaymentState.findEnum("BalanceDue")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePlainEnumValueLabelChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePlainEnumValueLabelChangeTest.java
index d8a3abe3167..b6dc4b0516a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePlainEnumValueLabelChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePlainEnumValueLabelChangeTest.java
@@ -1,34 +1,28 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangePlainEnumValueLabelChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangePlainEnumValueLabelChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangePlainEnumValueLabelChangeBuilder builder) {
         ChangePlainEnumValueLabelChange changePlainEnumValueLabelChange = builder.buildUnchecked();
         Assertions.assertThat(changePlainEnumValueLabelChange).isInstanceOf(ChangePlainEnumValueLabelChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangePlainEnumValueLabelChange.builder().change("change") },
-                new Object[] { ChangePlainEnumValueLabelChange.builder().previousValue("previousValue") },
-                new Object[] { ChangePlainEnumValueLabelChange.builder().nextValue("nextValue") },
-                new Object[] { ChangePlainEnumValueLabelChange.builder().attributeName("attributeName") },
-                new Object[] { ChangePlainEnumValueLabelChange.builder().valueKey("valueKey") } };
+        return new Object[][] { new Object[] { "change", ChangePlainEnumValueLabelChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangePlainEnumValueLabelChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", ChangePlainEnumValueLabelChange.builder().nextValue("nextValue") },
+                new Object[] { "attributeName",
+                        ChangePlainEnumValueLabelChange.builder().attributeName("attributeName") },
+                new Object[] { "valueKey", ChangePlainEnumValueLabelChange.builder().valueKey("valueKey") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePlainEnumValueOrderChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePlainEnumValueOrderChangeTest.java
index 6cfd0d47739..8b1da5f7c6c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePlainEnumValueOrderChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePlainEnumValueOrderChangeTest.java
@@ -3,37 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangePlainEnumValueOrderChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangePlainEnumValueOrderChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangePlainEnumValueOrderChangeBuilder builder) {
         ChangePlainEnumValueOrderChange changePlainEnumValueOrderChange = builder.buildUnchecked();
         Assertions.assertThat(changePlainEnumValueOrderChange).isInstanceOf(ChangePlainEnumValueOrderChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangePlainEnumValueOrderChange.builder().change("change") },
-                new Object[] { ChangePlainEnumValueOrderChange.builder()
-                        .previousValue(Collections
-                                .singletonList(new com.commercetools.history.models.change_value.EnumValueImpl())) },
-                new Object[] { ChangePlainEnumValueOrderChange.builder()
-                        .nextValue(Collections
-                                .singletonList(new com.commercetools.history.models.change_value.EnumValueImpl())) },
-                new Object[] { ChangePlainEnumValueOrderChange.builder().attributeName("attributeName") } };
+        return new Object[][] { new Object[] { "change", ChangePlainEnumValueOrderChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangePlainEnumValueOrderChange.builder()
+                                .previousValue(Collections.singletonList(
+                                    new com.commercetools.history.models.change_value.EnumValueImpl())) },
+                new Object[] { "nextValue",
+                        ChangePlainEnumValueOrderChange.builder()
+                                .nextValue(Collections.singletonList(
+                                    new com.commercetools.history.models.change_value.EnumValueImpl())) },
+                new Object[] { "attributeName",
+                        ChangePlainEnumValueOrderChange.builder().attributeName("attributeName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePredicateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePredicateChangeTest.java
index cfeb0c175c1..c3dc6a66d7b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePredicateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePredicateChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangePredicateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangePredicateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangePredicateChangeBuilder builder) {
         ChangePredicateChange changePredicateChange = builder.buildUnchecked();
         Assertions.assertThat(changePredicateChange).isInstanceOf(ChangePredicateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangePredicateChange.builder().change("change") },
-                new Object[] { ChangePredicateChange.builder().previousValue("previousValue") },
-                new Object[] { ChangePredicateChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", ChangePredicateChange.builder().change("change") },
+                new Object[] { "previousValue", ChangePredicateChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", ChangePredicateChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePriceChangeTest.java
index c2dd7c40572..3be6ab6d492 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangePriceChangeTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangePriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangePriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangePriceChangeBuilder builder) {
         ChangePriceChange changePriceChange = builder.buildUnchecked();
         Assertions.assertThat(changePriceChange).isInstanceOf(ChangePriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangePriceChange.builder().change("change") },
-                new Object[] { ChangePriceChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.PriceImpl()) },
-                new Object[] { ChangePriceChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.PriceImpl()) },
-                new Object[] { ChangePriceChange.builder().catalogData("catalogData") },
-                new Object[] { ChangePriceChange.builder().priceId("priceId") } };
+        return new Object[][] { new Object[] { "change", ChangePriceChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangePriceChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.PriceImpl()) },
+                new Object[] { "nextValue",
+                        ChangePriceChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.PriceImpl()) },
+                new Object[] { "catalogData", ChangePriceChange.builder().catalogData("catalogData") },
+                new Object[] { "priceId", ChangePriceChange.builder().priceId("priceId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeProductSelectionActiveChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeProductSelectionActiveChangeTest.java
index d75756c989f..e28650eec35 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeProductSelectionActiveChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeProductSelectionActiveChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeProductSelectionActiveChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeProductSelectionActiveChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeProductSelectionActiveChangeBuilder builder) {
         ChangeProductSelectionActiveChange changeProductSelectionActiveChange = builder.buildUnchecked();
         Assertions.assertThat(changeProductSelectionActiveChange)
                 .isInstanceOf(ChangeProductSelectionActiveChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeProductSelectionActiveChange.builder().change("change") },
-                new Object[] { ChangeProductSelectionActiveChange.builder()
-                        .productSelection(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { ChangeProductSelectionActiveChange.builder().previousValue(true) },
-                new Object[] { ChangeProductSelectionActiveChange.builder().nextValue(true) } };
+        return new Object[][] {
+                new Object[] { "change", ChangeProductSelectionActiveChange.builder().change("change") },
+                new Object[] { "productSelection",
+                        ChangeProductSelectionActiveChange.builder()
+                                .productSelection(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "previousValue", ChangeProductSelectionActiveChange.builder().previousValue(true) },
+                new Object[] { "nextValue", ChangeProductSelectionActiveChange.builder().nextValue(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeQuantityChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeQuantityChangeTest.java
index ea747b73f49..e76a7c8dd4a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeQuantityChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeQuantityChangeTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeQuantityChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeQuantityChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeQuantityChangeBuilder builder) {
         ChangeQuantityChange changeQuantityChange = builder.buildUnchecked();
         Assertions.assertThat(changeQuantityChange).isInstanceOf(ChangeQuantityChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeQuantityChange.builder().change("change") },
-                new Object[] { ChangeQuantityChange.builder()
-                        .previousValue(
-                            new com.commercetools.history.models.change_value.InventoryQuantityValueImpl()) },
-                new Object[] { ChangeQuantityChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeQuantityChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeQuantityChange.builder()
+                                .previousValue(
+                                    new com.commercetools.history.models.change_value.InventoryQuantityValueImpl()) },
+                new Object[] { "nextValue", ChangeQuantityChange.builder()
                         .nextValue(new com.commercetools.history.models.change_value.InventoryQuantityValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeQuoteRequestStateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeQuoteRequestStateChangeTest.java
index 943c08dda9d..6fa82461bc8 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeQuoteRequestStateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeQuoteRequestStateChangeTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeQuoteRequestStateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeQuoteRequestStateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeQuoteRequestStateChangeBuilder builder) {
         ChangeQuoteRequestStateChange changeQuoteRequestStateChange = builder.buildUnchecked();
         Assertions.assertThat(changeQuoteRequestStateChange).isInstanceOf(ChangeQuoteRequestStateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeQuoteRequestStateChange.builder().change("change") },
-                new Object[] { ChangeQuoteRequestStateChange.builder()
-                        .previousValue(
-                            com.commercetools.history.models.common.QuoteRequestState.findEnum("Submitted")) },
-                new Object[] { ChangeQuoteRequestStateChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeQuoteRequestStateChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeQuoteRequestStateChange.builder()
+                                .previousValue(
+                                    com.commercetools.history.models.common.QuoteRequestState.findEnum("Submitted")) },
+                new Object[] { "nextValue", ChangeQuoteRequestStateChange.builder()
                         .nextValue(com.commercetools.history.models.common.QuoteRequestState.findEnum("Submitted")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeQuoteStateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeQuoteStateChangeTest.java
index 63f61b34c2f..8599ae1e0d4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeQuoteStateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeQuoteStateChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeQuoteStateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeQuoteStateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeQuoteStateChangeBuilder builder) {
         ChangeQuoteStateChange changeQuoteStateChange = builder.buildUnchecked();
         Assertions.assertThat(changeQuoteStateChange).isInstanceOf(ChangeQuoteStateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeQuoteStateChange.builder().change("change") },
-                new Object[] { ChangeQuoteStateChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeQuoteStateChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeQuoteStateChange.builder()
                         .previousValue(com.commercetools.history.models.common.QuoteState.findEnum("Pending")) },
-                new Object[] { ChangeQuoteStateChange.builder()
+                new Object[] { "nextValue", ChangeQuoteStateChange.builder()
                         .nextValue(com.commercetools.history.models.common.QuoteState.findEnum("Pending")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeRequiresDiscountCodeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeRequiresDiscountCodeChangeTest.java
index 68c6b50af62..10894f2c73b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeRequiresDiscountCodeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeRequiresDiscountCodeChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeRequiresDiscountCodeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeRequiresDiscountCodeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeRequiresDiscountCodeChangeBuilder builder) {
         ChangeRequiresDiscountCodeChange changeRequiresDiscountCodeChange = builder.buildUnchecked();
         Assertions.assertThat(changeRequiresDiscountCodeChange).isInstanceOf(ChangeRequiresDiscountCodeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeRequiresDiscountCodeChange.builder().change("change") },
-                new Object[] { ChangeRequiresDiscountCodeChange.builder().previousValue(true) },
-                new Object[] { ChangeRequiresDiscountCodeChange.builder().nextValue(true) } };
+        return new Object[][] { new Object[] { "change", ChangeRequiresDiscountCodeChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeRequiresDiscountCodeChange.builder().previousValue(true) },
+                new Object[] { "nextValue", ChangeRequiresDiscountCodeChange.builder().nextValue(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeReviewRatingStatisticsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeReviewRatingStatisticsChangeTest.java
index 68e16b96d09..64d7dd1615d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeReviewRatingStatisticsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeReviewRatingStatisticsChangeTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeReviewRatingStatisticsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeReviewRatingStatisticsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeReviewRatingStatisticsChangeBuilder builder) {
         ChangeReviewRatingStatisticsChange changeReviewRatingStatisticsChange = builder.buildUnchecked();
         Assertions.assertThat(changeReviewRatingStatisticsChange)
                 .isInstanceOf(ChangeReviewRatingStatisticsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeReviewRatingStatisticsChange.builder().change("change") },
-                new Object[] { ChangeReviewRatingStatisticsChange.builder()
+        return new Object[][] {
+                new Object[] { "change", ChangeReviewRatingStatisticsChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeReviewRatingStatisticsChange.builder()
                         .previousValue(new com.commercetools.history.models.common.ReviewRatingStatisticsImpl()) },
-                new Object[] { ChangeReviewRatingStatisticsChange.builder()
+                new Object[] { "nextValue", ChangeReviewRatingStatisticsChange.builder()
                         .nextValue(new com.commercetools.history.models.common.ReviewRatingStatisticsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeShipmentStateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeShipmentStateChangeTest.java
index a6c8bab358e..35843e44918 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeShipmentStateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeShipmentStateChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeShipmentStateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeShipmentStateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeShipmentStateChangeBuilder builder) {
         ChangeShipmentStateChange changeShipmentStateChange = builder.buildUnchecked();
         Assertions.assertThat(changeShipmentStateChange).isInstanceOf(ChangeShipmentStateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeShipmentStateChange.builder().change("change") },
-                new Object[] { ChangeShipmentStateChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeShipmentStateChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeShipmentStateChange.builder()
                         .previousValue(com.commercetools.history.models.common.ShipmentState.findEnum("Shipped")) },
-                new Object[] { ChangeShipmentStateChange.builder()
+                new Object[] { "nextValue", ChangeShipmentStateChange.builder()
                         .nextValue(com.commercetools.history.models.common.ShipmentState.findEnum("Shipped")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeShoppingListLineItemQuantityChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeShoppingListLineItemQuantityChangeTest.java
index feb43a492de..67df3b0bcb2 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeShoppingListLineItemQuantityChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeShoppingListLineItemQuantityChangeTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeShoppingListLineItemQuantityChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeShoppingListLineItemQuantityChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeShoppingListLineItemQuantityChangeBuilder builder) {
         ChangeShoppingListLineItemQuantityChange changeShoppingListLineItemQuantityChange = builder.buildUnchecked();
         Assertions.assertThat(changeShoppingListLineItemQuantityChange)
                 .isInstanceOf(ChangeShoppingListLineItemQuantityChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeShoppingListLineItemQuantityChange.builder().change("change") },
-                new Object[] { ChangeShoppingListLineItemQuantityChange.builder().previousValue(8) },
-                new Object[] { ChangeShoppingListLineItemQuantityChange.builder().nextValue(7) },
-                new Object[] { ChangeShoppingListLineItemQuantityChange.builder()
+        return new Object[][] {
+                new Object[] { "change", ChangeShoppingListLineItemQuantityChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeShoppingListLineItemQuantityChange.builder().previousValue(8) },
+                new Object[] { "nextValue", ChangeShoppingListLineItemQuantityChange.builder().nextValue(7) },
+                new Object[] { "lineItem", ChangeShoppingListLineItemQuantityChange.builder()
                         .lineItem(
                             new com.commercetools.history.models.change_value.ShoppingListLineItemValueImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeShoppingListLineItemsOrderChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeShoppingListLineItemsOrderChangeTest.java
index 3d2913e4b8d..aa746f411a3 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeShoppingListLineItemsOrderChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeShoppingListLineItemsOrderChangeTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeShoppingListLineItemsOrderChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeShoppingListLineItemsOrderChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeShoppingListLineItemsOrderChangeBuilder builder) {
         ChangeShoppingListLineItemsOrderChange changeShoppingListLineItemsOrderChange = builder.buildUnchecked();
         Assertions.assertThat(changeShoppingListLineItemsOrderChange)
                 .isInstanceOf(ChangeShoppingListLineItemsOrderChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeShoppingListLineItemsOrderChange.builder().change("change") },
-                new Object[] { ChangeShoppingListLineItemsOrderChange.builder()
+        return new Object[][] {
+                new Object[] { "change", ChangeShoppingListLineItemsOrderChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeShoppingListLineItemsOrderChange.builder()
                         .previousValue(Collections.singletonList(
                             new com.commercetools.history.models.change_value.ShoppingListLineItemValueImpl())) },
-                new Object[] { ChangeShoppingListLineItemsOrderChange.builder()
+                new Object[] { "nextValue", ChangeShoppingListLineItemsOrderChange.builder()
                         .nextValue(Collections.singletonList(
                             new com.commercetools.history.models.change_value.ShoppingListLineItemValueImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeSlugChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeSlugChangeTest.java
index 2497a74d457..3d9b85997c0 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeSlugChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeSlugChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeSlugChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeSlugChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeSlugChangeBuilder builder) {
         ChangeSlugChange changeSlugChange = builder.buildUnchecked();
         Assertions.assertThat(changeSlugChange).isInstanceOf(ChangeSlugChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeSlugChange.builder().change("change") },
-                new Object[] { ChangeSlugChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeSlugChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeSlugChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeSlugChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue", ChangeSlugChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeSortOrderChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeSortOrderChangeTest.java
index 20b277085b4..e57c6cab9aa 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeSortOrderChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeSortOrderChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeSortOrderChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeSortOrderChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeSortOrderChangeBuilder builder) {
         ChangeSortOrderChange changeSortOrderChange = builder.buildUnchecked();
         Assertions.assertThat(changeSortOrderChange).isInstanceOf(ChangeSortOrderChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeSortOrderChange.builder().change("change") },
-                new Object[] { ChangeSortOrderChange.builder().previousValue("previousValue") },
-                new Object[] { ChangeSortOrderChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", ChangeSortOrderChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeSortOrderChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", ChangeSortOrderChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStackingModeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStackingModeChangeTest.java
index c7c218600d2..9bdd3ae42f4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStackingModeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStackingModeChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeStackingModeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeStackingModeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeStackingModeChangeBuilder builder) {
         ChangeStackingModeChange changeStackingModeChange = builder.buildUnchecked();
         Assertions.assertThat(changeStackingModeChange).isInstanceOf(ChangeStackingModeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeStackingModeChange.builder().change("change") },
-                new Object[] { ChangeStackingModeChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeStackingModeChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeStackingModeChange.builder()
                         .previousValue(com.commercetools.history.models.common.StackingMode.findEnum("Stacking")) },
-                new Object[] { ChangeStackingModeChange.builder()
+                new Object[] { "nextValue", ChangeStackingModeChange.builder()
                         .nextValue(com.commercetools.history.models.common.StackingMode.findEnum("Stacking")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStagedQuoteStateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStagedQuoteStateChangeTest.java
index 996f90944a6..8ff6d82298f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStagedQuoteStateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStagedQuoteStateChangeTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeStagedQuoteStateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeStagedQuoteStateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeStagedQuoteStateChangeBuilder builder) {
         ChangeStagedQuoteStateChange changeStagedQuoteStateChange = builder.buildUnchecked();
         Assertions.assertThat(changeStagedQuoteStateChange).isInstanceOf(ChangeStagedQuoteStateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeStagedQuoteStateChange.builder().change("change") },
-                new Object[] { ChangeStagedQuoteStateChange.builder()
-                        .previousValue(
-                            com.commercetools.history.models.common.StagedQuoteState.findEnum("InProgress")) },
-                new Object[] { ChangeStagedQuoteStateChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeStagedQuoteStateChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeStagedQuoteStateChange.builder()
+                                .previousValue(
+                                    com.commercetools.history.models.common.StagedQuoteState.findEnum("InProgress")) },
+                new Object[] { "nextValue", ChangeStagedQuoteStateChange.builder()
                         .nextValue(com.commercetools.history.models.common.StagedQuoteState.findEnum("InProgress")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeTest.java
index 6614e5f7b13..76f4ed7938f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeStateTypeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeStateTypeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeStateTypeChangeBuilder builder) {
         ChangeStateTypeChange changeStateTypeChange = builder.buildUnchecked();
         Assertions.assertThat(changeStateTypeChange).isInstanceOf(ChangeStateTypeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeStateTypeChange.builder().change("change") },
-                new Object[] { ChangeStateTypeChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeStateTypeChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeStateTypeChange.builder()
                         .previousValue(com.commercetools.history.models.common.StateTypeEnum.findEnum("OrderState")) },
-                new Object[] { ChangeStateTypeChange.builder()
+                new Object[] { "nextValue", ChangeStateTypeChange.builder()
                         .nextValue(com.commercetools.history.models.common.StateTypeEnum.findEnum("OrderState")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStatusChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStatusChangeTest.java
index 4ff2dc515fc..ee232defa74 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStatusChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStatusChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeStatusChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeStatusChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeStatusChangeBuilder builder) {
         ChangeStatusChange changeStatusChange = builder.buildUnchecked();
         Assertions.assertThat(changeStatusChange).isInstanceOf(ChangeStatusChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeStatusChange.builder().change("change") },
-                new Object[] { ChangeStatusChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeStatusChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeStatusChange.builder()
                         .previousValue(com.commercetools.history.models.common.BusinessUnitStatus.findEnum("Active")) },
-                new Object[] { ChangeStatusChange.builder()
+                new Object[] { "nextValue", ChangeStatusChange.builder()
                         .nextValue(com.commercetools.history.models.common.BusinessUnitStatus.findEnum("Active")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTargetChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTargetChangeTest.java
index 0007bba5f67..547d7d02529 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTargetChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTargetChangeTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTargetChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTargetChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTargetChangeBuilder builder) {
         ChangeTargetChange changeTargetChange = builder.buildUnchecked();
         Assertions.assertThat(changeTargetChange).isInstanceOf(ChangeTargetChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeTargetChange.builder().change("change") },
-                new Object[] { ChangeTargetChange.builder()
-                        .previousValue(
-                            new com.commercetools.history.models.change_value.ChangeTargetChangeValueImpl()) },
-                new Object[] { ChangeTargetChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeTargetChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeTargetChange.builder()
+                                .previousValue(
+                                    new com.commercetools.history.models.change_value.ChangeTargetChangeValueImpl()) },
+                new Object[] { "nextValue", ChangeTargetChange.builder()
                         .nextValue(new com.commercetools.history.models.change_value.ChangeTargetChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTaxCalculationModeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTaxCalculationModeChangeTest.java
index 9ddcf822a39..011d852c78d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTaxCalculationModeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTaxCalculationModeChangeTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTaxCalculationModeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTaxCalculationModeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTaxCalculationModeChangeBuilder builder) {
         ChangeTaxCalculationModeChange changeTaxCalculationModeChange = builder.buildUnchecked();
         Assertions.assertThat(changeTaxCalculationModeChange).isInstanceOf(ChangeTaxCalculationModeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeTaxCalculationModeChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", ChangeTaxCalculationModeChange.builder().change("change") },
+                new Object[] { "previousValue",
                         ChangeTaxCalculationModeChange.builder()
                                 .previousValue(com.commercetools.history.models.common.TaxCalculationMode
                                         .findEnum("LineItemLevel")) },
-                new Object[] { ChangeTaxCalculationModeChange.builder()
+                new Object[] { "nextValue", ChangeTaxCalculationModeChange.builder()
                         .nextValue(
                             com.commercetools.history.models.common.TaxCalculationMode.findEnum("LineItemLevel")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTaxModeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTaxModeChangeTest.java
index d4f6cb30d70..14cb5e005ca 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTaxModeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTaxModeChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTaxModeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTaxModeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTaxModeChangeBuilder builder) {
         ChangeTaxModeChange changeTaxModeChange = builder.buildUnchecked();
         Assertions.assertThat(changeTaxModeChange).isInstanceOf(ChangeTaxModeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeTaxModeChange.builder().change("change") },
-                new Object[] { ChangeTaxModeChange.builder()
-                        .previousValue(com.commercetools.history.models.common.TaxMode.findEnum("Platform")) },
-                new Object[] { ChangeTaxModeChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeTaxModeChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeTaxModeChange.builder()
+                                .previousValue(com.commercetools.history.models.common.TaxMode.findEnum("Platform")) },
+                new Object[] { "nextValue", ChangeTaxModeChange.builder()
                         .nextValue(com.commercetools.history.models.common.TaxMode.findEnum("Platform")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTaxRoundingModeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTaxRoundingModeChangeTest.java
index dec5e74830b..8371c9379f7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTaxRoundingModeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTaxRoundingModeChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTaxRoundingModeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTaxRoundingModeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTaxRoundingModeChangeBuilder builder) {
         ChangeTaxRoundingModeChange changeTaxRoundingModeChange = builder.buildUnchecked();
         Assertions.assertThat(changeTaxRoundingModeChange).isInstanceOf(ChangeTaxRoundingModeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeTaxRoundingModeChange.builder().change("change") },
-                new Object[] { ChangeTaxRoundingModeChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeTaxRoundingModeChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeTaxRoundingModeChange.builder()
                         .previousValue(com.commercetools.history.models.common.RoundingMode.findEnum("HalfEven")) },
-                new Object[] { ChangeTaxRoundingModeChange.builder()
+                new Object[] { "nextValue", ChangeTaxRoundingModeChange.builder()
                         .nextValue(com.commercetools.history.models.common.RoundingMode.findEnum("HalfEven")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTextLineItemNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTextLineItemNameChangeTest.java
index 47c16c3fa3b..52a67a584d4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTextLineItemNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTextLineItemNameChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTextLineItemNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTextLineItemNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTextLineItemNameChangeBuilder builder) {
         ChangeTextLineItemNameChange changeTextLineItemNameChange = builder.buildUnchecked();
         Assertions.assertThat(changeTextLineItemNameChange).isInstanceOf(ChangeTextLineItemNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeTextLineItemNameChange.builder().change("change") },
-                new Object[] { ChangeTextLineItemNameChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeTextLineItemNameChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ChangeTextLineItemNameChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeTextLineItemNameChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeTextLineItemNameChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue",
+                        ChangeTextLineItemNameChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "textLineItem", ChangeTextLineItemNameChange.builder()
                         .textLineItem(new com.commercetools.history.models.change_value.TextLineItemValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTextLineItemQuantityChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTextLineItemQuantityChangeTest.java
index c7152d356fa..ae848b1e5f7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTextLineItemQuantityChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTextLineItemQuantityChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTextLineItemQuantityChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTextLineItemQuantityChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTextLineItemQuantityChangeBuilder builder) {
         ChangeTextLineItemQuantityChange changeTextLineItemQuantityChange = builder.buildUnchecked();
         Assertions.assertThat(changeTextLineItemQuantityChange).isInstanceOf(ChangeTextLineItemQuantityChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeTextLineItemQuantityChange.builder().change("change") },
-                new Object[] { ChangeTextLineItemQuantityChange.builder().previousValue(8) },
-                new Object[] { ChangeTextLineItemQuantityChange.builder().nextValue(7) },
-                new Object[] { ChangeTextLineItemQuantityChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeTextLineItemQuantityChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeTextLineItemQuantityChange.builder().previousValue(8) },
+                new Object[] { "nextValue", ChangeTextLineItemQuantityChange.builder().nextValue(7) },
+                new Object[] { "textLineItem", ChangeTextLineItemQuantityChange.builder()
                         .textLineItem(new com.commercetools.history.models.change_value.TextLineItemValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTextLineItemsOrderChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTextLineItemsOrderChangeTest.java
index 683429d690a..b6c9656b80f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTextLineItemsOrderChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTextLineItemsOrderChangeTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTextLineItemsOrderChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTextLineItemsOrderChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTextLineItemsOrderChangeBuilder builder) {
         ChangeTextLineItemsOrderChange changeTextLineItemsOrderChange = builder.buildUnchecked();
         Assertions.assertThat(changeTextLineItemsOrderChange).isInstanceOf(ChangeTextLineItemsOrderChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeTextLineItemsOrderChange.builder().change("change") },
-                new Object[] { ChangeTextLineItemsOrderChange.builder()
-                        .previousValue(Collections.singletonList(
-                            new com.commercetools.history.models.change_value.TextLineItemValueImpl())) },
-                new Object[] { ChangeTextLineItemsOrderChange.builder()
-                        .nextValue(Collections.singletonList(
-                            new com.commercetools.history.models.change_value.TextLineItemValueImpl())) } };
+        return new Object[][] { new Object[] { "change", ChangeTextLineItemsOrderChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeTextLineItemsOrderChange.builder()
+                                .previousValue(Collections.singletonList(
+                                    new com.commercetools.history.models.change_value.TextLineItemValueImpl())) },
+                new Object[] { "nextValue",
+                        ChangeTextLineItemsOrderChange.builder()
+                                .nextValue(Collections.singletonList(
+                                    new com.commercetools.history.models.change_value.TextLineItemValueImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTransactionInteractionIdChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTransactionInteractionIdChangeTest.java
index 3c6c7c91e3b..32e4f852e4d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTransactionInteractionIdChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTransactionInteractionIdChangeTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTransactionInteractionIdChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTransactionInteractionIdChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTransactionInteractionIdChangeBuilder builder) {
         ChangeTransactionInteractionIdChange changeTransactionInteractionIdChange = builder.buildUnchecked();
         Assertions.assertThat(changeTransactionInteractionIdChange)
                 .isInstanceOf(ChangeTransactionInteractionIdChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeTransactionInteractionIdChange.builder().change("change") },
-                new Object[] { ChangeTransactionInteractionIdChange.builder().previousValue("previousValue") },
-                new Object[] { ChangeTransactionInteractionIdChange.builder().nextValue("nextValue") },
-                new Object[] { ChangeTransactionInteractionIdChange.builder()
-                        .transaction(
-                            new com.commercetools.history.models.change_value.TransactionChangeValueImpl()) } };
+        return new Object[][] {
+                new Object[] { "change", ChangeTransactionInteractionIdChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeTransactionInteractionIdChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", ChangeTransactionInteractionIdChange.builder().nextValue("nextValue") },
+                new Object[] { "transaction",
+                        ChangeTransactionInteractionIdChange.builder()
+                                .transaction(
+                                    new com.commercetools.history.models.change_value.TransactionChangeValueImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTransactionStateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTransactionStateChangeTest.java
index 9510ab65600..aae4f6ae58a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTransactionStateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTransactionStateChangeTest.java
@@ -1,37 +1,30 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTransactionStateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTransactionStateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTransactionStateChangeBuilder builder) {
         ChangeTransactionStateChange changeTransactionStateChange = builder.buildUnchecked();
         Assertions.assertThat(changeTransactionStateChange).isInstanceOf(ChangeTransactionStateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeTransactionStateChange.builder().change("change") },
-                new Object[] { ChangeTransactionStateChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeTransactionStateChange.builder().change("change") },
+                new Object[] { "previousValue", ChangeTransactionStateChange.builder()
                         .previousValue(com.commercetools.history.models.common.TransactionState.findEnum("Initial")) },
-                new Object[] { ChangeTransactionStateChange.builder()
+                new Object[] { "nextValue", ChangeTransactionStateChange.builder()
                         .nextValue(com.commercetools.history.models.common.TransactionState.findEnum("Initial")) },
-                new Object[] { ChangeTransactionStateChange.builder()
-                        .transaction(
-                            new com.commercetools.history.models.change_value.TransactionChangeValueImpl()) } };
+                new Object[] { "transaction",
+                        ChangeTransactionStateChange.builder()
+                                .transaction(
+                                    new com.commercetools.history.models.change_value.TransactionChangeValueImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTransactionTimestampChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTransactionTimestampChangeTest.java
index 33675a4898b..e8f5550e4c4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTransactionTimestampChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeTransactionTimestampChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTransactionTimestampChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTransactionTimestampChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTransactionTimestampChangeBuilder builder) {
         ChangeTransactionTimestampChange changeTransactionTimestampChange = builder.buildUnchecked();
         Assertions.assertThat(changeTransactionTimestampChange).isInstanceOf(ChangeTransactionTimestampChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeTransactionTimestampChange.builder().change("change") },
-                new Object[] { ChangeTransactionTimestampChange.builder().previousValue("previousValue") },
-                new Object[] { ChangeTransactionTimestampChange.builder().nextValue("nextValue") },
-                new Object[] { ChangeTransactionTimestampChange.builder()
-                        .transaction(
-                            new com.commercetools.history.models.change_value.TransactionChangeValueImpl()) } };
+        return new Object[][] { new Object[] { "change", ChangeTransactionTimestampChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeTransactionTimestampChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", ChangeTransactionTimestampChange.builder().nextValue("nextValue") },
+                new Object[] { "transaction",
+                        ChangeTransactionTimestampChange.builder()
+                                .transaction(
+                                    new com.commercetools.history.models.change_value.TransactionChangeValueImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeValueChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeValueChangeTest.java
index 5b3f9f7c5dc..9c53978318c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeValueChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeValueChangeTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeValueChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeValueChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeValueChangeBuilder builder) {
         ChangeValueChange changeValueChange = builder.buildUnchecked();
         Assertions.assertThat(changeValueChange).isInstanceOf(ChangeValueChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeValueChange.builder().change("change") },
-                new Object[] { ChangeValueChange.builder()
-                        .previousValue(
-                            new com.commercetools.history.models.change_value.ChangeValueChangeValueImpl()) },
-                new Object[] { ChangeValueChange.builder()
+        return new Object[][] { new Object[] { "change", ChangeValueChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        ChangeValueChange.builder()
+                                .previousValue(
+                                    new com.commercetools.history.models.change_value.ChangeValueChangeValueImpl()) },
+                new Object[] { "nextValue", ChangeValueChange.builder()
                         .nextValue(new com.commercetools.history.models.change_value.ChangeValueChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/MoveImageToPositionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/MoveImageToPositionChangeTest.java
index 02ab6ef0403..280970bcf31 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/MoveImageToPositionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/MoveImageToPositionChangeTest.java
@@ -3,39 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MoveImageToPositionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MoveImageToPositionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MoveImageToPositionChangeBuilder builder) {
         MoveImageToPositionChange moveImageToPositionChange = builder.buildUnchecked();
         Assertions.assertThat(moveImageToPositionChange).isInstanceOf(MoveImageToPositionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MoveImageToPositionChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", MoveImageToPositionChange.builder().change("change") },
+                new Object[] { "previousValue",
                         MoveImageToPositionChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ImageImpl())) },
-                new Object[] {
+                new Object[] { "nextValue",
                         MoveImageToPositionChange.builder()
                                 .nextValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ImageImpl())) },
-                new Object[] { MoveImageToPositionChange.builder().catalogData("catalogData") } };
+                new Object[] { "catalogData", MoveImageToPositionChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/PublishChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/PublishChangeTest.java
index fd8f799ba0d..8f849896017 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/PublishChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/PublishChangeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PublishChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PublishChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PublishChangeBuilder builder) {
         PublishChange publishChange = builder.buildUnchecked();
         Assertions.assertThat(publishChange).isInstanceOf(PublishChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PublishChange.builder().change("change") } };
+        return new Object[][] { new Object[] { "change", PublishChange.builder().change("change") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAddressChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAddressChangeTest.java
index 46336837c43..bddf46584f8 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAddressChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAddressChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveAddressChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveAddressChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveAddressChangeBuilder builder) {
         RemoveAddressChange removeAddressChange = builder.buildUnchecked();
         Assertions.assertThat(removeAddressChange).isInstanceOf(RemoveAddressChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveAddressChange.builder().change("change") },
-                new Object[] { RemoveAddressChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveAddressChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveAddressChange.builder()
                         .previousValue(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAssetChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAssetChangeTest.java
index ac0e4803f8d..2514eb2c573 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAssetChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAssetChangeTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveAssetChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveAssetChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveAssetChangeBuilder builder) {
         RemoveAssetChange removeAssetChange = builder.buildUnchecked();
         Assertions.assertThat(removeAssetChange).isInstanceOf(RemoveAssetChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveAssetChange.builder().change("change") }, new Object[] {
+        return new Object[][] { new Object[] { "change", RemoveAssetChange.builder().change("change") }, new Object[] {
+                "previousValue",
                 RemoveAssetChange.builder().previousValue(new com.commercetools.history.models.common.AssetImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAssociateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAssociateChangeTest.java
index aa5b5706a5e..2c9fbecac1a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAssociateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAssociateChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveAssociateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveAssociateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveAssociateChangeBuilder builder) {
         RemoveAssociateChange removeAssociateChange = builder.buildUnchecked();
         Assertions.assertThat(removeAssociateChange).isInstanceOf(RemoveAssociateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveAssociateChange.builder().change("change") },
-                new Object[] { RemoveAssociateChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveAssociateChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveAssociateChange.builder()
                         .previousValue(new com.commercetools.history.models.common.AssociateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAttributeDefinitionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAttributeDefinitionChangeTest.java
index d5da2b47edb..46c51fb75c7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAttributeDefinitionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveAttributeDefinitionChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveAttributeDefinitionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveAttributeDefinitionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveAttributeDefinitionChangeBuilder builder) {
         RemoveAttributeDefinitionChange removeAttributeDefinitionChange = builder.buildUnchecked();
         Assertions.assertThat(removeAttributeDefinitionChange).isInstanceOf(RemoveAttributeDefinitionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveAttributeDefinitionChange.builder().change("change") },
-                new Object[] { RemoveAttributeDefinitionChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveAttributeDefinitionChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveAttributeDefinitionChange.builder()
                         .previousValue(new com.commercetools.history.models.common.AttributeDefinitionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveBillingAddressIdChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveBillingAddressIdChangeTest.java
index 64710ab03b7..abacd3d7975 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveBillingAddressIdChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveBillingAddressIdChangeTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveBillingAddressIdChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveBillingAddressIdChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveBillingAddressIdChangeBuilder builder) {
         RemoveBillingAddressIdChange removeBillingAddressIdChange = builder.buildUnchecked();
         Assertions.assertThat(removeBillingAddressIdChange).isInstanceOf(RemoveBillingAddressIdChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveBillingAddressIdChange.builder().change("change") },
-                new Object[] { RemoveBillingAddressIdChange.builder()
-                        .previousValue(Collections.singletonList("previousValue")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", RemoveBillingAddressIdChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        RemoveBillingAddressIdChange.builder()
+                                .previousValue(Collections.singletonList("previousValue")) },
+                new Object[] { "nextValue",
                         RemoveBillingAddressIdChange.builder().nextValue(Collections.singletonList("nextValue")) },
-                new Object[] { RemoveBillingAddressIdChange.builder()
+                new Object[] { "address", RemoveBillingAddressIdChange.builder()
                         .address(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeTest.java
index 25090a4e690..ef61f87126f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveChannelRolesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveChannelRolesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveChannelRolesChangeBuilder builder) {
         RemoveChannelRolesChange removeChannelRolesChange = builder.buildUnchecked();
         Assertions.assertThat(removeChannelRolesChange).isInstanceOf(RemoveChannelRolesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveChannelRolesChange.builder().change("change") },
-                new Object[] { RemoveChannelRolesChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveChannelRolesChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveChannelRolesChange.builder()
                         .previousValue(Collections.singletonList(
                             com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply"))) },
-                new Object[] { RemoveChannelRolesChange.builder()
+                new Object[] { "nextValue", RemoveChannelRolesChange.builder()
                         .nextValue(Collections.singletonList(
                             com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply"))) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveCustomLineItemChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveCustomLineItemChangeTest.java
index 3386e935911..73973485bee 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveCustomLineItemChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveCustomLineItemChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveCustomLineItemChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveCustomLineItemChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveCustomLineItemChangeBuilder builder) {
         RemoveCustomLineItemChange removeCustomLineItemChange = builder.buildUnchecked();
         Assertions.assertThat(removeCustomLineItemChange).isInstanceOf(RemoveCustomLineItemChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveCustomLineItemChange.builder().change("change") },
-                new Object[] { RemoveCustomLineItemChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.CustomLineItemImpl()) },
-                new Object[] { RemoveCustomLineItemChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveCustomLineItemChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        RemoveCustomLineItemChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.CustomLineItemImpl()) },
+                new Object[] { "nextValue", RemoveCustomLineItemChange.builder()
                         .nextValue(new com.commercetools.history.models.common.CustomLineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveDeliveryItemsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveDeliveryItemsChangeTest.java
index cd1c379d9a7..687d67c14ff 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveDeliveryItemsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveDeliveryItemsChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveDeliveryItemsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveDeliveryItemsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveDeliveryItemsChangeBuilder builder) {
         RemoveDeliveryItemsChange removeDeliveryItemsChange = builder.buildUnchecked();
         Assertions.assertThat(removeDeliveryItemsChange).isInstanceOf(RemoveDeliveryItemsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveDeliveryItemsChange.builder().change("change") },
-                new Object[] { RemoveDeliveryItemsChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveDeliveryItemsChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveDeliveryItemsChange.builder()
                         .previousValue(new com.commercetools.history.models.common.DeliveryImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveDiscountCodeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveDiscountCodeChangeTest.java
index 994a2c9a40d..4dde603c420 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveDiscountCodeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveDiscountCodeChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveDiscountCodeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveDiscountCodeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveDiscountCodeChangeBuilder builder) {
         RemoveDiscountCodeChange removeDiscountCodeChange = builder.buildUnchecked();
         Assertions.assertThat(removeDiscountCodeChange).isInstanceOf(RemoveDiscountCodeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveDiscountCodeChange.builder().change("change") },
-                new Object[] { RemoveDiscountCodeChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveDiscountCodeChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveDiscountCodeChange.builder()
                         .previousValue(new com.commercetools.history.models.common.DiscountCodeInfoImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveEnumValuesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveEnumValuesChangeTest.java
index 789b91126b5..5a6e5b3a22d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveEnumValuesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveEnumValuesChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveEnumValuesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveEnumValuesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveEnumValuesChangeBuilder builder) {
         RemoveEnumValuesChange removeEnumValuesChange = builder.buildUnchecked();
         Assertions.assertThat(removeEnumValuesChange).isInstanceOf(RemoveEnumValuesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveEnumValuesChange.builder().change("change") },
-                new Object[] { RemoveEnumValuesChange.builder()
-                        .previousValue(new com.commercetools.history.models.change_value.EnumValueImpl()) },
-                new Object[] { RemoveEnumValuesChange.builder().attributeName("attributeName") } };
+        return new Object[][] { new Object[] { "change", RemoveEnumValuesChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        RemoveEnumValuesChange.builder()
+                                .previousValue(new com.commercetools.history.models.change_value.EnumValueImpl()) },
+                new Object[] { "attributeName", RemoveEnumValuesChange.builder().attributeName("attributeName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveFieldDefinitionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveFieldDefinitionChangeTest.java
index 09f1e7e2906..d3a32e4faf1 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveFieldDefinitionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveFieldDefinitionChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveFieldDefinitionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveFieldDefinitionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveFieldDefinitionChangeBuilder builder) {
         RemoveFieldDefinitionChange removeFieldDefinitionChange = builder.buildUnchecked();
         Assertions.assertThat(removeFieldDefinitionChange).isInstanceOf(RemoveFieldDefinitionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveFieldDefinitionChange.builder().change("change") },
-                new Object[] { RemoveFieldDefinitionChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveFieldDefinitionChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveFieldDefinitionChange.builder()
                         .previousValue(new com.commercetools.history.models.common.FieldDefinitionImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveFromCategoryChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveFromCategoryChangeTest.java
index 7b26e0dd7e7..decdef90db9 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveFromCategoryChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveFromCategoryChangeTest.java
@@ -3,39 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveFromCategoryChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveFromCategoryChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveFromCategoryChangeBuilder builder) {
         RemoveFromCategoryChange removeFromCategoryChange = builder.buildUnchecked();
         Assertions.assertThat(removeFromCategoryChange).isInstanceOf(RemoveFromCategoryChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveFromCategoryChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", RemoveFromCategoryChange.builder().change("change") },
+                new Object[] { "previousValue",
                         RemoveFromCategoryChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ReferenceImpl())) },
-                new Object[] {
+                new Object[] { "nextValue",
                         RemoveFromCategoryChange.builder()
                                 .nextValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ReferenceImpl())) },
-                new Object[] { RemoveFromCategoryChange.builder()
+                new Object[] { "category", RemoveFromCategoryChange.builder()
                         .category(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveImageChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveImageChangeTest.java
index 46caa340983..faf49d62718 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveImageChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveImageChangeTest.java
@@ -3,39 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveImageChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveImageChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveImageChangeBuilder builder) {
         RemoveImageChange removeImageChange = builder.buildUnchecked();
         Assertions.assertThat(removeImageChange).isInstanceOf(RemoveImageChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveImageChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", RemoveImageChange.builder().change("change") },
+                new Object[] { "previousValue",
                         RemoveImageChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ImageImpl())) },
-                new Object[] {
+                new Object[] { "nextValue",
                         RemoveImageChange.builder()
                                 .nextValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ImageImpl())) },
-                new Object[] { RemoveImageChange.builder().catalogData("catalogData") } };
+                new Object[] { "catalogData", RemoveImageChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveInheritedAssociateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveInheritedAssociateChangeTest.java
index 490f81143f4..054089c149f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveInheritedAssociateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveInheritedAssociateChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveInheritedAssociateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveInheritedAssociateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveInheritedAssociateChangeBuilder builder) {
         RemoveInheritedAssociateChange removeInheritedAssociateChange = builder.buildUnchecked();
         Assertions.assertThat(removeInheritedAssociateChange).isInstanceOf(RemoveInheritedAssociateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveInheritedAssociateChange.builder().change("change") },
-                new Object[] { RemoveInheritedAssociateChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveInheritedAssociateChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveInheritedAssociateChange.builder()
                         .previousValue(new com.commercetools.history.models.common.InheritedAssociateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveItemShippingAddressesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveItemShippingAddressesChangeTest.java
index 9a7a41cd66a..c0a57129e58 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveItemShippingAddressesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveItemShippingAddressesChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveItemShippingAddressesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveItemShippingAddressesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveItemShippingAddressesChangeBuilder builder) {
         RemoveItemShippingAddressesChange removeItemShippingAddressesChange = builder.buildUnchecked();
         Assertions.assertThat(removeItemShippingAddressesChange).isInstanceOf(RemoveItemShippingAddressesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveItemShippingAddressesChange.builder().change("change") },
-                new Object[] { RemoveItemShippingAddressesChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { RemoveItemShippingAddressesChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveItemShippingAddressesChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        RemoveItemShippingAddressesChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "nextValue", RemoveItemShippingAddressesChange.builder()
                         .nextValue(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveLocalizedEnumValuesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveLocalizedEnumValuesChangeTest.java
index a357c3eebaf..c34ad089430 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveLocalizedEnumValuesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveLocalizedEnumValuesChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveLocalizedEnumValuesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveLocalizedEnumValuesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveLocalizedEnumValuesChangeBuilder builder) {
         RemoveLocalizedEnumValuesChange removeLocalizedEnumValuesChange = builder.buildUnchecked();
         Assertions.assertThat(removeLocalizedEnumValuesChange).isInstanceOf(RemoveLocalizedEnumValuesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveLocalizedEnumValuesChange.builder().change("change") },
-                new Object[] { RemoveLocalizedEnumValuesChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveLocalizedEnumValuesChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveLocalizedEnumValuesChange.builder()
                         .previousValue(new com.commercetools.history.models.change_value.LocalizedEnumValueImpl()) },
-                new Object[] { RemoveLocalizedEnumValuesChange.builder().attributeName("attributeName") } };
+                new Object[] { "attributeName",
+                        RemoveLocalizedEnumValuesChange.builder().attributeName("attributeName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveLocationChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveLocationChangeTest.java
index 187273761fb..be340dc1269 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveLocationChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveLocationChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveLocationChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveLocationChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveLocationChangeBuilder builder) {
         RemoveLocationChange removeLocationChange = builder.buildUnchecked();
         Assertions.assertThat(removeLocationChange).isInstanceOf(RemoveLocationChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveLocationChange.builder().change("change") },
-                new Object[] { RemoveLocationChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveLocationChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveLocationChange.builder()
                         .previousValue(new com.commercetools.history.models.common.LocationImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveOrderLineItemChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveOrderLineItemChangeTest.java
index fbc2291f575..67f34d50598 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveOrderLineItemChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveOrderLineItemChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveOrderLineItemChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveOrderLineItemChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveOrderLineItemChangeBuilder builder) {
         RemoveOrderLineItemChange removeOrderLineItemChange = builder.buildUnchecked();
         Assertions.assertThat(removeOrderLineItemChange).isInstanceOf(RemoveOrderLineItemChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveOrderLineItemChange.builder().change("change") },
-                new Object[] { RemoveOrderLineItemChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LineItemImpl()) },
-                new Object[] { RemoveOrderLineItemChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveOrderLineItemChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        RemoveOrderLineItemChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LineItemImpl()) },
+                new Object[] { "nextValue", RemoveOrderLineItemChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveParcelFromDeliveryChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveParcelFromDeliveryChangeTest.java
index 97c3939562e..f30caca314d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveParcelFromDeliveryChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveParcelFromDeliveryChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveParcelFromDeliveryChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveParcelFromDeliveryChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveParcelFromDeliveryChangeBuilder builder) {
         RemoveParcelFromDeliveryChange removeParcelFromDeliveryChange = builder.buildUnchecked();
         Assertions.assertThat(removeParcelFromDeliveryChange).isInstanceOf(RemoveParcelFromDeliveryChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveParcelFromDeliveryChange.builder().change("change") },
-                new Object[] { RemoveParcelFromDeliveryChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ParcelImpl()) },
-                new Object[] { RemoveParcelFromDeliveryChange.builder().deliveryId("deliveryId") } };
+        return new Object[][] { new Object[] { "change", RemoveParcelFromDeliveryChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        RemoveParcelFromDeliveryChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ParcelImpl()) },
+                new Object[] { "deliveryId", RemoveParcelFromDeliveryChange.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemovePaymentChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemovePaymentChangeTest.java
index 2f812892283..e35d5f10e62 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemovePaymentChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemovePaymentChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemovePaymentChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemovePaymentChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemovePaymentChangeBuilder builder) {
         RemovePaymentChange removePaymentChange = builder.buildUnchecked();
         Assertions.assertThat(removePaymentChange).isInstanceOf(RemovePaymentChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemovePaymentChange.builder().change("change") },
-                new Object[] { RemovePaymentChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.PaymentInfoImpl()) },
-                new Object[] { RemovePaymentChange.builder()
+        return new Object[][] { new Object[] { "change", RemovePaymentChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        RemovePaymentChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.PaymentInfoImpl()) },
+                new Object[] { "nextValue", RemovePaymentChange.builder()
                         .nextValue(new com.commercetools.history.models.common.PaymentInfoImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemovePriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemovePriceChangeTest.java
index b193f780bc4..43b2dce80f2 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemovePriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemovePriceChangeTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemovePriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemovePriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemovePriceChangeBuilder builder) {
         RemovePriceChange removePriceChange = builder.buildUnchecked();
         Assertions.assertThat(removePriceChange).isInstanceOf(RemovePriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemovePriceChange.builder().change("change") },
-                new Object[] { RemovePriceChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.PriceImpl()) },
-                new Object[] { RemovePriceChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.PriceImpl()) },
-                new Object[] { RemovePriceChange.builder().catalogData("catalogData") },
-                new Object[] { RemovePriceChange.builder().priceId("priceId") } };
+        return new Object[][] { new Object[] { "change", RemovePriceChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        RemovePriceChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.PriceImpl()) },
+                new Object[] { "nextValue",
+                        RemovePriceChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.PriceImpl()) },
+                new Object[] { "catalogData", RemovePriceChange.builder().catalogData("catalogData") },
+                new Object[] { "priceId", RemovePriceChange.builder().priceId("priceId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveProductChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveProductChangeTest.java
index c2bdbd7c74c..101ed4c8cd4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveProductChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveProductChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveProductChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveProductChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveProductChangeBuilder builder) {
         RemoveProductChange removeProductChange = builder.buildUnchecked();
         Assertions.assertThat(removeProductChange).isInstanceOf(RemoveProductChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveProductChange.builder().change("change") },
-                new Object[] { RemoveProductChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveProductChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveProductChange.builder()
                         .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveProductSelectionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveProductSelectionChangeTest.java
index c535152e033..5be707ae3e7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveProductSelectionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveProductSelectionChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveProductSelectionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveProductSelectionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveProductSelectionChangeBuilder builder) {
         RemoveProductSelectionChange removeProductSelectionChange = builder.buildUnchecked();
         Assertions.assertThat(removeProductSelectionChange).isInstanceOf(RemoveProductSelectionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveProductSelectionChange.builder().change("change") },
-                new Object[] { RemoveProductSelectionChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveProductSelectionChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveProductSelectionChange.builder()
                         .previousValue(new com.commercetools.history.models.common.ProductSelectionSettingImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemovePropertyChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemovePropertyChangeTest.java
index 92440d6d383..47ddcdfd294 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemovePropertyChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemovePropertyChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemovePropertyChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemovePropertyChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemovePropertyChangeBuilder builder) {
         RemovePropertyChange removePropertyChange = builder.buildUnchecked();
         Assertions.assertThat(removePropertyChange).isInstanceOf(RemovePropertyChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemovePropertyChange.builder().change("change") },
-                new Object[] { RemovePropertyChange.builder().previousValue("previousValue") },
-                new Object[] { RemovePropertyChange.builder().path("path") } };
+        return new Object[][] { new Object[] { "change", RemovePropertyChange.builder().change("change") },
+                new Object[] { "previousValue", RemovePropertyChange.builder().previousValue("previousValue") },
+                new Object[] { "path", RemovePropertyChange.builder().path("path") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveShippingAddressIdChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveShippingAddressIdChangeTest.java
index f979def84aa..54f051589c8 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveShippingAddressIdChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveShippingAddressIdChangeTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveShippingAddressIdChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveShippingAddressIdChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveShippingAddressIdChangeBuilder builder) {
         RemoveShippingAddressIdChange removeShippingAddressIdChange = builder.buildUnchecked();
         Assertions.assertThat(removeShippingAddressIdChange).isInstanceOf(RemoveShippingAddressIdChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveShippingAddressIdChange.builder().change("change") },
-                new Object[] { RemoveShippingAddressIdChange.builder()
-                        .previousValue(Collections.singletonList("previousValue")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", RemoveShippingAddressIdChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        RemoveShippingAddressIdChange.builder()
+                                .previousValue(Collections.singletonList("previousValue")) },
+                new Object[] { "nextValue",
                         RemoveShippingAddressIdChange.builder().nextValue(Collections.singletonList("nextValue")) },
-                new Object[] { RemoveShippingAddressIdChange.builder()
+                new Object[] { "address", RemoveShippingAddressIdChange.builder()
                         .address(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveShoppingListLineItemChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveShoppingListLineItemChangeTest.java
index 52f9a436132..57135ab049a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveShoppingListLineItemChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveShoppingListLineItemChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveShoppingListLineItemChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveShoppingListLineItemChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveShoppingListLineItemChangeBuilder builder) {
         RemoveShoppingListLineItemChange removeShoppingListLineItemChange = builder.buildUnchecked();
         Assertions.assertThat(removeShoppingListLineItemChange).isInstanceOf(RemoveShoppingListLineItemChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveShoppingListLineItemChange.builder().change("change") },
-                new Object[] { RemoveShoppingListLineItemChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LineItemImpl()) },
-                new Object[] { RemoveShoppingListLineItemChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveShoppingListLineItemChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        RemoveShoppingListLineItemChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LineItemImpl()) },
+                new Object[] { "nextValue", RemoveShoppingListLineItemChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeTest.java
index 1938df12757..e393f36a52e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveStateRolesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveStateRolesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveStateRolesChangeBuilder builder) {
         RemoveStateRolesChange removeStateRolesChange = builder.buildUnchecked();
         Assertions.assertThat(removeStateRolesChange).isInstanceOf(RemoveStateRolesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveStateRolesChange.builder().change("change") },
-                new Object[] { RemoveStateRolesChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveStateRolesChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveStateRolesChange.builder()
                         .previousValue(Collections.singletonList(com.commercetools.history.models.common.StateRoleEnum
                                 .findEnum("ReviewIncludedInStatistics"))) },
-                new Object[] { RemoveStateRolesChange.builder()
+                new Object[] { "nextValue", RemoveStateRolesChange.builder()
                         .nextValue(Collections.singletonList(com.commercetools.history.models.common.StateRoleEnum
                                 .findEnum("ReviewIncludedInStatistics"))) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeTest.java
index 62871886b10..57e15ef3b76 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveTaxRateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveTaxRateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveTaxRateChangeBuilder builder) {
         RemoveTaxRateChange removeTaxRateChange = builder.buildUnchecked();
         Assertions.assertThat(removeTaxRateChange).isInstanceOf(RemoveTaxRateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveTaxRateChange.builder().change("change") },
-                new Object[] { RemoveTaxRateChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveTaxRateChange.builder().change("change") },
+                new Object[] { "previousValue", RemoveTaxRateChange.builder()
                         .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveTextLineItemChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveTextLineItemChangeTest.java
index 8650670d4c7..5481a297090 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveTextLineItemChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveTextLineItemChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveTextLineItemChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveTextLineItemChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveTextLineItemChangeBuilder builder) {
         RemoveTextLineItemChange removeTextLineItemChange = builder.buildUnchecked();
         Assertions.assertThat(removeTextLineItemChange).isInstanceOf(RemoveTextLineItemChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveTextLineItemChange.builder().change("change") },
-                new Object[] { RemoveTextLineItemChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.TextLineItemImpl()) },
-                new Object[] { RemoveTextLineItemChange.builder()
+        return new Object[][] { new Object[] { "change", RemoveTextLineItemChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        RemoveTextLineItemChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.TextLineItemImpl()) },
+                new Object[] { "nextValue", RemoveTextLineItemChange.builder()
                         .nextValue(new com.commercetools.history.models.common.TextLineItemImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveVariantChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveVariantChangeTest.java
index 17658664ef2..f90073b0207 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveVariantChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveVariantChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveVariantChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveVariantChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveVariantChangeBuilder builder) {
         RemoveVariantChange removeVariantChange = builder.buildUnchecked();
         Assertions.assertThat(removeVariantChange).isInstanceOf(RemoveVariantChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveVariantChange.builder().change("change") },
-                new Object[] { RemoveVariantChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.VariantImpl()) },
-                new Object[] { RemoveVariantChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.VariantImpl()) },
-                new Object[] { RemoveVariantChange.builder().catalogData("catalogData") } };
+        return new Object[][] { new Object[] { "change", RemoveVariantChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        RemoveVariantChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.VariantImpl()) },
+                new Object[] { "nextValue",
+                        RemoveVariantChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.VariantImpl()) },
+                new Object[] { "catalogData", RemoveVariantChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RequestQuoteRenegotiationChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RequestQuoteRenegotiationChangeTest.java
index f40be37ed3a..9f642570a21 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RequestQuoteRenegotiationChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RequestQuoteRenegotiationChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RequestQuoteRenegotiationChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RequestQuoteRenegotiationChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RequestQuoteRenegotiationChangeBuilder builder) {
         RequestQuoteRenegotiationChange requestQuoteRenegotiationChange = builder.buildUnchecked();
         Assertions.assertThat(requestQuoteRenegotiationChange).isInstanceOf(RequestQuoteRenegotiationChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RequestQuoteRenegotiationChange.builder().change("change") },
-                new Object[] { RequestQuoteRenegotiationChange.builder()
+        return new Object[][] { new Object[] { "change", RequestQuoteRenegotiationChange.builder().change("change") },
+                new Object[] { "previousValue", RequestQuoteRenegotiationChange.builder()
                         .previousValue(com.commercetools.history.models.common.QuoteState.findEnum("Pending")) },
-                new Object[] { RequestQuoteRenegotiationChange.builder()
-                        .nextValue(com.commercetools.history.models.common.QuoteState.findEnum("Pending")) },
-                new Object[] { RequestQuoteRenegotiationChange.builder().buyerComment("buyerComment") } };
+                new Object[] { "nextValue",
+                        RequestQuoteRenegotiationChange.builder()
+                                .nextValue(com.commercetools.history.models.common.QuoteState.findEnum("Pending")) },
+                new Object[] { "buyerComment",
+                        RequestQuoteRenegotiationChange.builder().buyerComment("buyerComment") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAddressChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAddressChangeTest.java
index 7260c9a770e..ccb1d16fb55 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAddressChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAddressChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAddressChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAddressChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAddressChangeBuilder builder) {
         SetAddressChange setAddressChange = builder.buildUnchecked();
         Assertions.assertThat(setAddressChange).isInstanceOf(SetAddressChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAddressChange.builder().change("change") },
-                new Object[] { SetAddressChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { SetAddressChange.builder()
+        return new Object[][] { new Object[] { "change", SetAddressChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetAddressChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "nextValue", SetAddressChange.builder()
                         .nextValue(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAddressCustomFieldChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAddressCustomFieldChangeTest.java
index 9ed4d88ffe2..746c275f0fd 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAddressCustomFieldChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAddressCustomFieldChangeTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAddressCustomFieldChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAddressCustomFieldChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAddressCustomFieldChangeBuilder builder) {
         SetAddressCustomFieldChange setAddressCustomFieldChange = builder.buildUnchecked();
         Assertions.assertThat(setAddressCustomFieldChange).isInstanceOf(SetAddressCustomFieldChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAddressCustomFieldChange.builder().change("change") },
-                new Object[] { SetAddressCustomFieldChange.builder()
-                        .address(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { SetAddressCustomFieldChange.builder().name("name") },
-                new Object[] { SetAddressCustomFieldChange.builder().customTypeId("customTypeId") },
-                new Object[] { SetAddressCustomFieldChange.builder().previousValue("previousValue") },
-                new Object[] { SetAddressCustomFieldChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetAddressCustomFieldChange.builder().change("change") },
+                new Object[] { "address",
+                        SetAddressCustomFieldChange.builder()
+                                .address(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "name", SetAddressCustomFieldChange.builder().name("name") },
+                new Object[] { "customTypeId", SetAddressCustomFieldChange.builder().customTypeId("customTypeId") },
+                new Object[] { "previousValue", SetAddressCustomFieldChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetAddressCustomFieldChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAddressCustomTypeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAddressCustomTypeChangeTest.java
index aa5484b1e18..e76470a3034 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAddressCustomTypeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAddressCustomTypeChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAddressCustomTypeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAddressCustomTypeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAddressCustomTypeChangeBuilder builder) {
         SetAddressCustomTypeChange setAddressCustomTypeChange = builder.buildUnchecked();
         Assertions.assertThat(setAddressCustomTypeChange).isInstanceOf(SetAddressCustomTypeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAddressCustomTypeChange.builder().change("change") },
-                new Object[] { SetAddressCustomTypeChange.builder()
-                        .address(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { SetAddressCustomTypeChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetAddressCustomTypeChange.builder()
+        return new Object[][] { new Object[] { "change", SetAddressCustomTypeChange.builder().change("change") },
+                new Object[] { "address",
+                        SetAddressCustomTypeChange.builder()
+                                .address(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "previousValue",
+                        SetAddressCustomTypeChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "nextValue", SetAddressCustomTypeChange.builder()
                         .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAnonymousIdChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAnonymousIdChangeTest.java
index 518453266af..b77f875c18f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAnonymousIdChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAnonymousIdChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAnonymousIdChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAnonymousIdChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAnonymousIdChangeBuilder builder) {
         SetAnonymousIdChange setAnonymousIdChange = builder.buildUnchecked();
         Assertions.assertThat(setAnonymousIdChange).isInstanceOf(SetAnonymousIdChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAnonymousIdChange.builder().change("change") },
-                new Object[] { SetAnonymousIdChange.builder().previousValue("previousValue") },
-                new Object[] { SetAnonymousIdChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetAnonymousIdChange.builder().change("change") },
+                new Object[] { "previousValue", SetAnonymousIdChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetAnonymousIdChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetApplicationVersionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetApplicationVersionChangeTest.java
index d1cfbe3860f..997c0ed8d01 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetApplicationVersionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetApplicationVersionChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetApplicationVersionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetApplicationVersionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetApplicationVersionChangeBuilder builder) {
         SetApplicationVersionChange setApplicationVersionChange = builder.buildUnchecked();
         Assertions.assertThat(setApplicationVersionChange).isInstanceOf(SetApplicationVersionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetApplicationVersionChange.builder().change("change") },
-                new Object[] { SetApplicationVersionChange.builder().previousValue(8) },
-                new Object[] { SetApplicationVersionChange.builder().nextValue(7) } };
+        return new Object[][] { new Object[] { "change", SetApplicationVersionChange.builder().change("change") },
+                new Object[] { "previousValue", SetApplicationVersionChange.builder().previousValue(8) },
+                new Object[] { "nextValue", SetApplicationVersionChange.builder().nextValue(7) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetCustomFieldChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetCustomFieldChangeTest.java
index 10437961559..bae619968ad 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetCustomFieldChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetCustomFieldChangeTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAssetCustomFieldChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAssetCustomFieldChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAssetCustomFieldChangeBuilder builder) {
         SetAssetCustomFieldChange setAssetCustomFieldChange = builder.buildUnchecked();
         Assertions.assertThat(setAssetCustomFieldChange).isInstanceOf(SetAssetCustomFieldChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAssetCustomFieldChange.builder().change("change") },
-                new Object[] { SetAssetCustomFieldChange.builder().previousValue("previousValue") },
-                new Object[] { SetAssetCustomFieldChange.builder().nextValue("nextValue") },
-                new Object[] { SetAssetCustomFieldChange.builder().name("name") },
-                new Object[] { SetAssetCustomFieldChange.builder().customTypeId("customTypeId") },
-                new Object[] { SetAssetCustomFieldChange.builder()
+        return new Object[][] { new Object[] { "change", SetAssetCustomFieldChange.builder().change("change") },
+                new Object[] { "previousValue", SetAssetCustomFieldChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetAssetCustomFieldChange.builder().nextValue("nextValue") },
+                new Object[] { "name", SetAssetCustomFieldChange.builder().name("name") },
+                new Object[] { "customTypeId", SetAssetCustomFieldChange.builder().customTypeId("customTypeId") },
+                new Object[] { "asset", SetAssetCustomFieldChange.builder()
                         .asset(new com.commercetools.history.models.change_value.AssetChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetCustomTypeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetCustomTypeChangeTest.java
index 8423a86fc4c..11b02a59641 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetCustomTypeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetCustomTypeChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAssetCustomTypeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAssetCustomTypeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAssetCustomTypeChangeBuilder builder) {
         SetAssetCustomTypeChange setAssetCustomTypeChange = builder.buildUnchecked();
         Assertions.assertThat(setAssetCustomTypeChange).isInstanceOf(SetAssetCustomTypeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAssetCustomTypeChange.builder().change("change") },
-                new Object[] { SetAssetCustomTypeChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetAssetCustomTypeChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetAssetCustomTypeChange.builder()
+        return new Object[][] { new Object[] { "change", SetAssetCustomTypeChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetAssetCustomTypeChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "nextValue",
+                        SetAssetCustomTypeChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "asset", SetAssetCustomTypeChange.builder()
                         .asset(new com.commercetools.history.models.change_value.AssetChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetDescriptionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetDescriptionChangeTest.java
index f4a9aeafbf7..9c4ec83381f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetDescriptionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetDescriptionChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAssetDescriptionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAssetDescriptionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAssetDescriptionChangeBuilder builder) {
         SetAssetDescriptionChange setAssetDescriptionChange = builder.buildUnchecked();
         Assertions.assertThat(setAssetDescriptionChange).isInstanceOf(SetAssetDescriptionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAssetDescriptionChange.builder().change("change") },
-                new Object[] { SetAssetDescriptionChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetAssetDescriptionChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetAssetDescriptionChange.builder()
+        return new Object[][] { new Object[] { "change", SetAssetDescriptionChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetAssetDescriptionChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue",
+                        SetAssetDescriptionChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "asset", SetAssetDescriptionChange.builder()
                         .asset(new com.commercetools.history.models.change_value.AssetChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetKeyChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetKeyChangeTest.java
index d1a4c41ce59..c39432f8bfd 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetKeyChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetKeyChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAssetKeyChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAssetKeyChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAssetKeyChangeBuilder builder) {
         SetAssetKeyChange setAssetKeyChange = builder.buildUnchecked();
         Assertions.assertThat(setAssetKeyChange).isInstanceOf(SetAssetKeyChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAssetKeyChange.builder().change("change") },
-                new Object[] { SetAssetKeyChange.builder().previousValue("previousValue") },
-                new Object[] { SetAssetKeyChange.builder().nextValue("nextValue") },
-                new Object[] { SetAssetKeyChange.builder()
+        return new Object[][] { new Object[] { "change", SetAssetKeyChange.builder().change("change") },
+                new Object[] { "previousValue", SetAssetKeyChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetAssetKeyChange.builder().nextValue("nextValue") },
+                new Object[] { "asset", SetAssetKeyChange.builder()
                         .asset(new com.commercetools.history.models.change_value.AssetChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetSourcesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetSourcesChangeTest.java
index 92244c032b6..6a340db634c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetSourcesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetSourcesChangeTest.java
@@ -3,39 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAssetSourcesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAssetSourcesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAssetSourcesChangeBuilder builder) {
         SetAssetSourcesChange setAssetSourcesChange = builder.buildUnchecked();
         Assertions.assertThat(setAssetSourcesChange).isInstanceOf(SetAssetSourcesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAssetSourcesChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", SetAssetSourcesChange.builder().change("change") },
+                new Object[] { "previousValue",
                         SetAssetSourcesChange.builder()
                                 .previousValue(Collections.singletonList(
                                     new com.commercetools.history.models.common.AssetSourceImpl())) },
-                new Object[] {
+                new Object[] { "nextValue",
                         SetAssetSourcesChange.builder()
                                 .nextValue(Collections.singletonList(
                                     new com.commercetools.history.models.common.AssetSourceImpl())) },
-                new Object[] { SetAssetSourcesChange.builder()
+                new Object[] { "asset", SetAssetSourcesChange.builder()
                         .asset(new com.commercetools.history.models.change_value.AssetChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetTagsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetTagsChangeTest.java
index 93852013b56..1d97d940bc0 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetTagsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAssetTagsChangeTest.java
@@ -3,33 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAssetTagsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAssetTagsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAssetTagsChangeBuilder builder) {
         SetAssetTagsChange setAssetTagsChange = builder.buildUnchecked();
         Assertions.assertThat(setAssetTagsChange).isInstanceOf(SetAssetTagsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAssetTagsChange.builder().change("change") },
-                new Object[] { SetAssetTagsChange.builder().previousValue(Collections.singletonList("previousValue")) },
-                new Object[] { SetAssetTagsChange.builder().nextValue(Collections.singletonList("nextValue")) },
-                new Object[] { SetAssetTagsChange.builder()
+        return new Object[][] { new Object[] { "change", SetAssetTagsChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetAssetTagsChange.builder().previousValue(Collections.singletonList("previousValue")) },
+                new Object[] { "nextValue",
+                        SetAssetTagsChange.builder().nextValue(Collections.singletonList("nextValue")) },
+                new Object[] { "asset", SetAssetTagsChange.builder()
                         .asset(new com.commercetools.history.models.change_value.AssetChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAttributeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAttributeChangeTest.java
index 228df5fc848..ab929389d7d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAttributeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAttributeChangeTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAttributeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAttributeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAttributeChangeBuilder builder) {
         SetAttributeChange setAttributeChange = builder.buildUnchecked();
         Assertions.assertThat(setAttributeChange).isInstanceOf(SetAttributeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAttributeChange.builder().change("change") },
-                new Object[] { SetAttributeChange.builder()
+        return new Object[][] { new Object[] { "change", SetAttributeChange.builder().change("change") },
+                new Object[] { "previousValue", SetAttributeChange.builder()
                         .previousValue(new com.commercetools.history.models.change_value.AttributeValueImpl()) },
-                new Object[] { SetAttributeChange.builder()
-                        .nextValue(new com.commercetools.history.models.change_value.AttributeValueImpl()) },
-                new Object[] { SetAttributeChange.builder().catalogData("catalogData") } };
+                new Object[] { "nextValue",
+                        SetAttributeChange.builder()
+                                .nextValue(new com.commercetools.history.models.change_value.AttributeValueImpl()) },
+                new Object[] { "catalogData", SetAttributeChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAuthenticationModeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAuthenticationModeChangeTest.java
index bdc71f27340..d496dd25957 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAuthenticationModeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAuthenticationModeChangeTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAuthenticationModeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAuthenticationModeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAuthenticationModeChangeBuilder builder) {
         SetAuthenticationModeChange setAuthenticationModeChange = builder.buildUnchecked();
         Assertions.assertThat(setAuthenticationModeChange).isInstanceOf(SetAuthenticationModeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAuthenticationModeChange.builder().change("change") },
-                new Object[] { SetAuthenticationModeChange.builder()
-                        .previousValue(
-                            com.commercetools.history.models.common.AuthenticationMode.findEnum("Password")) },
-                new Object[] { SetAuthenticationModeChange.builder()
+        return new Object[][] { new Object[] { "change", SetAuthenticationModeChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetAuthenticationModeChange.builder()
+                                .previousValue(
+                                    com.commercetools.history.models.common.AuthenticationMode.findEnum("Password")) },
+                new Object[] { "nextValue", SetAuthenticationModeChange.builder()
                         .nextValue(com.commercetools.history.models.common.AuthenticationMode.findEnum("Password")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAuthorNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAuthorNameChangeTest.java
index 50e560a0f7d..1ff7f053bff 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAuthorNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetAuthorNameChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetAuthorNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetAuthorNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetAuthorNameChangeBuilder builder) {
         SetAuthorNameChange setAuthorNameChange = builder.buildUnchecked();
         Assertions.assertThat(setAuthorNameChange).isInstanceOf(SetAuthorNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetAuthorNameChange.builder().change("change") },
-                new Object[] { SetAuthorNameChange.builder().previousValue("previousValue") },
-                new Object[] { SetAuthorNameChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetAuthorNameChange.builder().change("change") },
+                new Object[] { "previousValue", SetAuthorNameChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetAuthorNameChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetBillingAddressChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetBillingAddressChangeTest.java
index f0e512332c1..3775b1423a8 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetBillingAddressChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetBillingAddressChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetBillingAddressChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetBillingAddressChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetBillingAddressChangeBuilder builder) {
         SetBillingAddressChange setBillingAddressChange = builder.buildUnchecked();
         Assertions.assertThat(setBillingAddressChange).isInstanceOf(SetBillingAddressChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetBillingAddressChange.builder().change("change") },
-                new Object[] { SetBillingAddressChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { SetBillingAddressChange.builder()
+        return new Object[][] { new Object[] { "change", SetBillingAddressChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetBillingAddressChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "nextValue", SetBillingAddressChange.builder()
                         .nextValue(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCartPredicateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCartPredicateChangeTest.java
index 14904d986cd..2a77228dafc 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCartPredicateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCartPredicateChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCartPredicateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCartPredicateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCartPredicateChangeBuilder builder) {
         SetCartPredicateChange setCartPredicateChange = builder.buildUnchecked();
         Assertions.assertThat(setCartPredicateChange).isInstanceOf(SetCartPredicateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCartPredicateChange.builder().change("change") },
-                new Object[] { SetCartPredicateChange.builder().previousValue("previousValue") },
-                new Object[] { SetCartPredicateChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetCartPredicateChange.builder().change("change") },
+                new Object[] { "previousValue", SetCartPredicateChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetCartPredicateChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCategoryOrderHintChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCategoryOrderHintChangeTest.java
index dcd8d90744f..213ced3302f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCategoryOrderHintChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCategoryOrderHintChangeTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCategoryOrderHintChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCategoryOrderHintChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCategoryOrderHintChangeBuilder builder) {
         SetCategoryOrderHintChange setCategoryOrderHintChange = builder.buildUnchecked();
         Assertions.assertThat(setCategoryOrderHintChange).isInstanceOf(SetCategoryOrderHintChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCategoryOrderHintChange.builder().change("change") },
-                new Object[] { SetCategoryOrderHintChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.CategoryOrderHintsImpl()) },
-                new Object[] { SetCategoryOrderHintChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.CategoryOrderHintsImpl()) },
-                new Object[] { SetCategoryOrderHintChange.builder().catalogData("catalogData") },
-                new Object[] { SetCategoryOrderHintChange.builder().categoryId("categoryId") } };
+        return new Object[][] { new Object[] { "change", SetCategoryOrderHintChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCategoryOrderHintChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.CategoryOrderHintsImpl()) },
+                new Object[] { "nextValue",
+                        SetCategoryOrderHintChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.CategoryOrderHintsImpl()) },
+                new Object[] { "catalogData", SetCategoryOrderHintChange.builder().catalogData("catalogData") },
+                new Object[] { "categoryId", SetCategoryOrderHintChange.builder().categoryId("categoryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeTest.java
index 8dc632cf172..6a1a7cf69b7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetChannelRolesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetChannelRolesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetChannelRolesChangeBuilder builder) {
         SetChannelRolesChange setChannelRolesChange = builder.buildUnchecked();
         Assertions.assertThat(setChannelRolesChange).isInstanceOf(SetChannelRolesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetChannelRolesChange.builder().change("change") },
-                new Object[] { SetChannelRolesChange.builder()
+        return new Object[][] { new Object[] { "change", SetChannelRolesChange.builder().change("change") },
+                new Object[] { "previousValue", SetChannelRolesChange.builder()
                         .previousValue(Collections.singletonList(
                             com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply"))) },
-                new Object[] { SetChannelRolesChange.builder()
+                new Object[] { "nextValue", SetChannelRolesChange.builder()
                         .nextValue(Collections.singletonList(
                             com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply"))) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCompanyNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCompanyNameChangeTest.java
index ac6fa417f40..e0ca5aebfd1 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCompanyNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCompanyNameChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCompanyNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCompanyNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCompanyNameChangeBuilder builder) {
         SetCompanyNameChange setCompanyNameChange = builder.buildUnchecked();
         Assertions.assertThat(setCompanyNameChange).isInstanceOf(SetCompanyNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCompanyNameChange.builder().change("change") },
-                new Object[] { SetCompanyNameChange.builder().previousValue("previousValue") },
-                new Object[] { SetCompanyNameChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetCompanyNameChange.builder().change("change") },
+                new Object[] { "previousValue", SetCompanyNameChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetCompanyNameChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetContactEmailChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetContactEmailChangeTest.java
index 8f15729270a..6a47794d5cb 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetContactEmailChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetContactEmailChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetContactEmailChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetContactEmailChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetContactEmailChangeBuilder builder) {
         SetContactEmailChange setContactEmailChange = builder.buildUnchecked();
         Assertions.assertThat(setContactEmailChange).isInstanceOf(SetContactEmailChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetContactEmailChange.builder().change("change") },
-                new Object[] { SetContactEmailChange.builder().previousValue("previousValue") },
-                new Object[] { SetContactEmailChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetContactEmailChange.builder().change("change") },
+                new Object[] { "previousValue", SetContactEmailChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetContactEmailChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCountriesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCountriesChangeTest.java
index a5aac1c23da..605e6648e7b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCountriesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCountriesChangeTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCountriesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCountriesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCountriesChangeBuilder builder) {
         SetCountriesChange setCountriesChange = builder.buildUnchecked();
         Assertions.assertThat(setCountriesChange).isInstanceOf(SetCountriesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCountriesChange.builder().change("change") },
-                new Object[] { SetCountriesChange.builder()
-                        .previousValue(Collections
-                                .singletonList(new com.commercetools.history.models.common.StoreCountryImpl())) },
-                new Object[] { SetCountriesChange.builder()
-                        .nextValue(Collections
-                                .singletonList(new com.commercetools.history.models.common.StoreCountryImpl())) } };
+        return new Object[][] { new Object[] { "change", SetCountriesChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCountriesChange.builder()
+                                .previousValue(Collections.singletonList(
+                                    new com.commercetools.history.models.common.StoreCountryImpl())) },
+                new Object[] { "nextValue",
+                        SetCountriesChange.builder()
+                                .nextValue(Collections.singletonList(
+                                    new com.commercetools.history.models.common.StoreCountryImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCountryChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCountryChangeTest.java
index b1750d69c35..4ab7d67bae8 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCountryChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCountryChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCountryChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCountryChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCountryChangeBuilder builder) {
         SetCountryChange setCountryChange = builder.buildUnchecked();
         Assertions.assertThat(setCountryChange).isInstanceOf(SetCountryChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCountryChange.builder().change("change") },
-                new Object[] { SetCountryChange.builder().previousValue("previousValue") },
-                new Object[] { SetCountryChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetCountryChange.builder().change("change") },
+                new Object[] { "previousValue", SetCountryChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetCountryChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomFieldChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomFieldChangeTest.java
index 804318e7b00..3bb30f1d631 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomFieldChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomFieldChangeTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomFieldChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomFieldChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomFieldChangeBuilder builder) {
         SetCustomFieldChange setCustomFieldChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomFieldChange).isInstanceOf(SetCustomFieldChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomFieldChange.builder().change("change") },
-                new Object[] { SetCustomFieldChange.builder().previousValue("previousValue") },
-                new Object[] { SetCustomFieldChange.builder().nextValue("nextValue") },
-                new Object[] { SetCustomFieldChange.builder().name("name") },
-                new Object[] { SetCustomFieldChange.builder().customTypeId("customTypeId") } };
+        return new Object[][] { new Object[] { "change", SetCustomFieldChange.builder().change("change") },
+                new Object[] { "previousValue", SetCustomFieldChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetCustomFieldChange.builder().nextValue("nextValue") },
+                new Object[] { "name", SetCustomFieldChange.builder().name("name") },
+                new Object[] { "customTypeId", SetCustomFieldChange.builder().customTypeId("customTypeId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemCustomFieldChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemCustomFieldChangeTest.java
index 57efe0b37e9..426245b73d7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemCustomFieldChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemCustomFieldChangeTest.java
@@ -1,37 +1,33 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomLineItemCustomFieldChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomLineItemCustomFieldChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomLineItemCustomFieldChangeBuilder builder) {
         SetCustomLineItemCustomFieldChange setCustomLineItemCustomFieldChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomLineItemCustomFieldChange)
                 .isInstanceOf(SetCustomLineItemCustomFieldChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomLineItemCustomFieldChange.builder().change("change") },
-                new Object[] { SetCustomLineItemCustomFieldChange.builder().previousValue("previousValue") },
-                new Object[] { SetCustomLineItemCustomFieldChange.builder().nextValue("nextValue") },
-                new Object[] { SetCustomLineItemCustomFieldChange.builder().name("name") },
-                new Object[] { SetCustomLineItemCustomFieldChange.builder()
-                        .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetCustomLineItemCustomFieldChange.builder().customLineItemId("customLineItemId") } };
+        return new Object[][] {
+                new Object[] { "change", SetCustomLineItemCustomFieldChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCustomLineItemCustomFieldChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetCustomLineItemCustomFieldChange.builder().nextValue("nextValue") },
+                new Object[] { "name", SetCustomLineItemCustomFieldChange.builder().name("name") },
+                new Object[] { "customLineItem",
+                        SetCustomLineItemCustomFieldChange.builder()
+                                .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "customLineItemId",
+                        SetCustomLineItemCustomFieldChange.builder().customLineItemId("customLineItemId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemCustomTypeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemCustomTypeChangeTest.java
index d8cf25e6dd4..9c94514f58a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemCustomTypeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemCustomTypeChangeTest.java
@@ -1,37 +1,33 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomLineItemCustomTypeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomLineItemCustomTypeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomLineItemCustomTypeChangeBuilder builder) {
         SetCustomLineItemCustomTypeChange setCustomLineItemCustomTypeChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomLineItemCustomTypeChange).isInstanceOf(SetCustomLineItemCustomTypeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomLineItemCustomTypeChange.builder().change("change") },
-                new Object[] { SetCustomLineItemCustomTypeChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetCustomLineItemCustomTypeChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetCustomLineItemCustomTypeChange.builder()
-                        .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetCustomLineItemCustomTypeChange.builder().customLineItemId("customLineItemId") } };
+        return new Object[][] { new Object[] { "change", SetCustomLineItemCustomTypeChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCustomLineItemCustomTypeChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "nextValue",
+                        SetCustomLineItemCustomTypeChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "customLineItem",
+                        SetCustomLineItemCustomTypeChange.builder()
+                                .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "customLineItemId",
+                        SetCustomLineItemCustomTypeChange.builder().customLineItemId("customLineItemId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemMoneyChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemMoneyChangeTest.java
index 4040ea351e9..7da6bf37547 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemMoneyChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemMoneyChangeTest.java
@@ -1,37 +1,33 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomLineItemMoneyChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomLineItemMoneyChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomLineItemMoneyChangeBuilder builder) {
         SetCustomLineItemMoneyChange setCustomLineItemMoneyChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomLineItemMoneyChange).isInstanceOf(SetCustomLineItemMoneyChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomLineItemMoneyChange.builder().change("change") },
-                new Object[] { SetCustomLineItemMoneyChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetCustomLineItemMoneyChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetCustomLineItemMoneyChange.builder()
-                        .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetCustomLineItemMoneyChange.builder().customLineItemId("customLineItemId") } };
+        return new Object[][] { new Object[] { "change", SetCustomLineItemMoneyChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCustomLineItemMoneyChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "nextValue",
+                        SetCustomLineItemMoneyChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "customLineItem",
+                        SetCustomLineItemMoneyChange.builder()
+                                .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "customLineItemId",
+                        SetCustomLineItemMoneyChange.builder().customLineItemId("customLineItemId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemShippingDetailsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemShippingDetailsChangeTest.java
index 74d5ce53582..7bcff4b8b80 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemShippingDetailsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemShippingDetailsChangeTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomLineItemShippingDetailsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomLineItemShippingDetailsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomLineItemShippingDetailsChangeBuilder builder) {
         SetCustomLineItemShippingDetailsChange setCustomLineItemShippingDetailsChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomLineItemShippingDetailsChange)
                 .isInstanceOf(SetCustomLineItemShippingDetailsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomLineItemShippingDetailsChange.builder().change("change") },
-                new Object[] { SetCustomLineItemShippingDetailsChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ItemShippingDetailsImpl()) },
-                new Object[] { SetCustomLineItemShippingDetailsChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.ItemShippingDetailsImpl()) },
-                new Object[] {
+        return new Object[][] {
+                new Object[] { "change", SetCustomLineItemShippingDetailsChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCustomLineItemShippingDetailsChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ItemShippingDetailsImpl()) },
+                new Object[] { "nextValue",
+                        SetCustomLineItemShippingDetailsChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.ItemShippingDetailsImpl()) },
+                new Object[] { "customLineItemId",
                         SetCustomLineItemShippingDetailsChange.builder().customLineItemId("customLineItemId") } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxAmountChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxAmountChangeTest.java
index 3b0e6d67c40..773140d22eb 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxAmountChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxAmountChangeTest.java
@@ -1,38 +1,34 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomLineItemTaxAmountChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomLineItemTaxAmountChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomLineItemTaxAmountChangeBuilder builder) {
         SetCustomLineItemTaxAmountChange setCustomLineItemTaxAmountChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomLineItemTaxAmountChange).isInstanceOf(SetCustomLineItemTaxAmountChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomLineItemTaxAmountChange.builder().change("change") },
-                new Object[] { SetCustomLineItemTaxAmountChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) },
-                new Object[] { SetCustomLineItemTaxAmountChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.TaxRateImpl()) },
-                new Object[] { SetCustomLineItemTaxAmountChange.builder()
-                        .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetCustomLineItemTaxAmountChange.builder().customLineItemId("customLineItemId") },
-                new Object[] { SetCustomLineItemTaxAmountChange.builder()
+        return new Object[][] { new Object[] { "change", SetCustomLineItemTaxAmountChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCustomLineItemTaxAmountChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) },
+                new Object[] { "nextValue",
+                        SetCustomLineItemTaxAmountChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.TaxRateImpl()) },
+                new Object[] { "customLineItem",
+                        SetCustomLineItemTaxAmountChange.builder()
+                                .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "customLineItemId",
+                        SetCustomLineItemTaxAmountChange.builder().customLineItemId("customLineItemId") },
+                new Object[] { "taxMode", SetCustomLineItemTaxAmountChange.builder()
                         .taxMode(com.commercetools.history.models.common.TaxMode.findEnum("Platform")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxCategoryChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxCategoryChangeTest.java
index b46487a2dbc..a62c1959c2f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxCategoryChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxCategoryChangeTest.java
@@ -1,38 +1,35 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomLineItemTaxCategoryChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomLineItemTaxCategoryChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomLineItemTaxCategoryChangeBuilder builder) {
         SetCustomLineItemTaxCategoryChange setCustomLineItemTaxCategoryChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomLineItemTaxCategoryChange)
                 .isInstanceOf(SetCustomLineItemTaxCategoryChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomLineItemTaxCategoryChange.builder().change("change") },
-                new Object[] { SetCustomLineItemTaxCategoryChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { SetCustomLineItemTaxCategoryChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { SetCustomLineItemTaxCategoryChange.builder()
-                        .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetCustomLineItemTaxCategoryChange.builder().customLineItemId("customLineItemId") } };
+        return new Object[][] {
+                new Object[] { "change", SetCustomLineItemTaxCategoryChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCustomLineItemTaxCategoryChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "nextValue",
+                        SetCustomLineItemTaxCategoryChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "customLineItem",
+                        SetCustomLineItemTaxCategoryChange.builder()
+                                .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "customLineItemId",
+                        SetCustomLineItemTaxCategoryChange.builder().customLineItemId("customLineItemId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxRateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxRateChangeTest.java
index fc1e320f363..9c590df21ba 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxRateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxRateChangeTest.java
@@ -1,38 +1,34 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomLineItemTaxRateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomLineItemTaxRateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomLineItemTaxRateChangeBuilder builder) {
         SetCustomLineItemTaxRateChange setCustomLineItemTaxRateChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomLineItemTaxRateChange).isInstanceOf(SetCustomLineItemTaxRateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomLineItemTaxRateChange.builder().change("change") },
-                new Object[] { SetCustomLineItemTaxRateChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) },
-                new Object[] { SetCustomLineItemTaxRateChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.TaxRateImpl()) },
-                new Object[] { SetCustomLineItemTaxRateChange.builder()
-                        .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetCustomLineItemTaxRateChange.builder().customLineItemId("customLineItemId") },
-                new Object[] { SetCustomLineItemTaxRateChange.builder()
+        return new Object[][] { new Object[] { "change", SetCustomLineItemTaxRateChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCustomLineItemTaxRateChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) },
+                new Object[] { "nextValue",
+                        SetCustomLineItemTaxRateChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.TaxRateImpl()) },
+                new Object[] { "customLineItem",
+                        SetCustomLineItemTaxRateChange.builder()
+                                .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "customLineItemId",
+                        SetCustomLineItemTaxRateChange.builder().customLineItemId("customLineItemId") },
+                new Object[] { "taxMode", SetCustomLineItemTaxRateChange.builder()
                         .taxMode(com.commercetools.history.models.common.TaxMode.findEnum("Platform")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxedPriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxedPriceChangeTest.java
index c8dccc35aef..97f679c877a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxedPriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTaxedPriceChangeTest.java
@@ -1,37 +1,33 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomLineItemTaxedPriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomLineItemTaxedPriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomLineItemTaxedPriceChangeBuilder builder) {
         SetCustomLineItemTaxedPriceChange setCustomLineItemTaxedPriceChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomLineItemTaxedPriceChange).isInstanceOf(SetCustomLineItemTaxedPriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomLineItemTaxedPriceChange.builder().change("change") },
-                new Object[] { SetCustomLineItemTaxedPriceChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetCustomLineItemTaxedPriceChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetCustomLineItemTaxedPriceChange.builder()
-                        .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetCustomLineItemTaxedPriceChange.builder().customLineItemId("customLineItemId") } };
+        return new Object[][] { new Object[] { "change", SetCustomLineItemTaxedPriceChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCustomLineItemTaxedPriceChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "nextValue",
+                        SetCustomLineItemTaxedPriceChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "customLineItem",
+                        SetCustomLineItemTaxedPriceChange.builder()
+                                .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "customLineItemId",
+                        SetCustomLineItemTaxedPriceChange.builder().customLineItemId("customLineItemId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTotalPriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTotalPriceChangeTest.java
index f3dace466d3..136b1e9131c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTotalPriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomLineItemTotalPriceChangeTest.java
@@ -1,37 +1,33 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomLineItemTotalPriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomLineItemTotalPriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomLineItemTotalPriceChangeBuilder builder) {
         SetCustomLineItemTotalPriceChange setCustomLineItemTotalPriceChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomLineItemTotalPriceChange).isInstanceOf(SetCustomLineItemTotalPriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomLineItemTotalPriceChange.builder().change("change") },
-                new Object[] { SetCustomLineItemTotalPriceChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetCustomLineItemTotalPriceChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetCustomLineItemTotalPriceChange.builder()
-                        .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetCustomLineItemTotalPriceChange.builder().customLineItemId("customLineItemId") } };
+        return new Object[][] { new Object[] { "change", SetCustomLineItemTotalPriceChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCustomLineItemTotalPriceChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "nextValue",
+                        SetCustomLineItemTotalPriceChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "customLineItem",
+                        SetCustomLineItemTotalPriceChange.builder()
+                                .customLineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "customLineItemId",
+                        SetCustomLineItemTotalPriceChange.builder().customLineItemId("customLineItemId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomShippingMethodChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomShippingMethodChangeTest.java
index 32bb1edaaa9..21de96df6a1 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomShippingMethodChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomShippingMethodChangeTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomShippingMethodChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomShippingMethodChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomShippingMethodChangeBuilder builder) {
         SetCustomShippingMethodChange setCustomShippingMethodChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomShippingMethodChange).isInstanceOf(SetCustomShippingMethodChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomShippingMethodChange.builder().change("change") },
-                new Object[] { SetCustomShippingMethodChange.builder()
+        return new Object[][] { new Object[] { "change", SetCustomShippingMethodChange.builder().change("change") },
+                new Object[] { "previousValue", SetCustomShippingMethodChange.builder()
                         .previousValue(
                             new com.commercetools.history.models.change_value.CustomShippingMethodChangeValueImpl()) },
-                new Object[] { SetCustomShippingMethodChange.builder()
+                new Object[] { "nextValue", SetCustomShippingMethodChange.builder()
                         .nextValue(
                             new com.commercetools.history.models.change_value.CustomShippingMethodChangeValueImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomTypeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomTypeChangeTest.java
index e0e0b6b9e70..913d46fbd7a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomTypeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomTypeChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomTypeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomTypeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomTypeChangeBuilder builder) {
         SetCustomTypeChange setCustomTypeChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomTypeChange).isInstanceOf(SetCustomTypeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomTypeChange.builder().change("change") },
-                new Object[] { SetCustomTypeChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetCustomTypeChange.builder()
+        return new Object[][] { new Object[] { "change", SetCustomTypeChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCustomTypeChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "nextValue", SetCustomTypeChange.builder()
                         .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerChangeTest.java
index c8310d4a4d8..3f93c16fb07 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomerChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomerChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomerChangeBuilder builder) {
         SetCustomerChange setCustomerChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomerChange).isInstanceOf(SetCustomerChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomerChange.builder().change("change") },
-                new Object[] { SetCustomerChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { SetCustomerChange.builder()
+        return new Object[][] { new Object[] { "change", SetCustomerChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCustomerChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "nextValue", SetCustomerChange.builder()
                         .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerEmailChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerEmailChangeTest.java
index f68849dc9bb..33e07344af6 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerEmailChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerEmailChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomerEmailChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomerEmailChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomerEmailChangeBuilder builder) {
         SetCustomerEmailChange setCustomerEmailChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomerEmailChange).isInstanceOf(SetCustomerEmailChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomerEmailChange.builder().change("change") },
-                new Object[] { SetCustomerEmailChange.builder().previousValue("previousValue") },
-                new Object[] { SetCustomerEmailChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetCustomerEmailChange.builder().change("change") },
+                new Object[] { "previousValue", SetCustomerEmailChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetCustomerEmailChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerGroupChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerGroupChangeTest.java
index 0b4b7941de3..711729a3a75 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerGroupChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerGroupChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomerGroupChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomerGroupChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomerGroupChangeBuilder builder) {
         SetCustomerGroupChange setCustomerGroupChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomerGroupChange).isInstanceOf(SetCustomerGroupChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomerGroupChange.builder().change("change") },
-                new Object[] { SetCustomerGroupChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { SetCustomerGroupChange.builder()
+        return new Object[][] { new Object[] { "change", SetCustomerGroupChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetCustomerGroupChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "nextValue", SetCustomerGroupChange.builder()
                         .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerIdChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerIdChangeTest.java
index 0685cf68bae..d22e7310d37 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerIdChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerIdChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomerIdChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomerIdChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomerIdChangeBuilder builder) {
         SetCustomerIdChange setCustomerIdChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomerIdChange).isInstanceOf(SetCustomerIdChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomerIdChange.builder().change("change") },
-                new Object[] { SetCustomerIdChange.builder().previousValue("previousValue") },
-                new Object[] { SetCustomerIdChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetCustomerIdChange.builder().change("change") },
+                new Object[] { "previousValue", SetCustomerIdChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetCustomerIdChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerNumberChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerNumberChangeTest.java
index 0416873c232..36576d590e6 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerNumberChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetCustomerNumberChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCustomerNumberChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCustomerNumberChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCustomerNumberChangeBuilder builder) {
         SetCustomerNumberChange setCustomerNumberChange = builder.buildUnchecked();
         Assertions.assertThat(setCustomerNumberChange).isInstanceOf(SetCustomerNumberChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCustomerNumberChange.builder().change("change") },
-                new Object[] { SetCustomerNumberChange.builder().previousValue("previousValue") },
-                new Object[] { SetCustomerNumberChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetCustomerNumberChange.builder().change("change") },
+                new Object[] { "previousValue", SetCustomerNumberChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetCustomerNumberChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDateOfBirthChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDateOfBirthChangeTest.java
index 51be43701cf..bdf45f5d72c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDateOfBirthChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDateOfBirthChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetDateOfBirthChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetDateOfBirthChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetDateOfBirthChangeBuilder builder) {
         SetDateOfBirthChange setDateOfBirthChange = builder.buildUnchecked();
         Assertions.assertThat(setDateOfBirthChange).isInstanceOf(SetDateOfBirthChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetDateOfBirthChange.builder().change("change") },
-                new Object[] { SetDateOfBirthChange.builder().previousValue("previousValue") },
-                new Object[] { SetDateOfBirthChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetDateOfBirthChange.builder().change("change") },
+                new Object[] { "previousValue", SetDateOfBirthChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetDateOfBirthChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDefaultBillingAddressChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDefaultBillingAddressChangeTest.java
index 0481c920e6b..20fcc5795e6 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDefaultBillingAddressChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDefaultBillingAddressChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetDefaultBillingAddressChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetDefaultBillingAddressChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetDefaultBillingAddressChangeBuilder builder) {
         SetDefaultBillingAddressChange setDefaultBillingAddressChange = builder.buildUnchecked();
         Assertions.assertThat(setDefaultBillingAddressChange).isInstanceOf(SetDefaultBillingAddressChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetDefaultBillingAddressChange.builder().change("change") },
-                new Object[] { SetDefaultBillingAddressChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { SetDefaultBillingAddressChange.builder()
+        return new Object[][] { new Object[] { "change", SetDefaultBillingAddressChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetDefaultBillingAddressChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "nextValue", SetDefaultBillingAddressChange.builder()
                         .nextValue(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDefaultShippingAddressChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDefaultShippingAddressChangeTest.java
index d6e552aa33c..9b2775b7b7b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDefaultShippingAddressChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDefaultShippingAddressChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetDefaultShippingAddressChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetDefaultShippingAddressChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetDefaultShippingAddressChangeBuilder builder) {
         SetDefaultShippingAddressChange setDefaultShippingAddressChange = builder.buildUnchecked();
         Assertions.assertThat(setDefaultShippingAddressChange).isInstanceOf(SetDefaultShippingAddressChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetDefaultShippingAddressChange.builder().change("change") },
-                new Object[] { SetDefaultShippingAddressChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { SetDefaultShippingAddressChange.builder()
+        return new Object[][] { new Object[] { "change", SetDefaultShippingAddressChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetDefaultShippingAddressChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "nextValue", SetDefaultShippingAddressChange.builder()
                         .nextValue(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDeleteDaysAfterLastModificationChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDeleteDaysAfterLastModificationChangeTest.java
index a801a78afef..5629a0dc821 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDeleteDaysAfterLastModificationChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDeleteDaysAfterLastModificationChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetDeleteDaysAfterLastModificationChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetDeleteDaysAfterLastModificationChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetDeleteDaysAfterLastModificationChangeBuilder builder) {
         SetDeleteDaysAfterLastModificationChange setDeleteDaysAfterLastModificationChange = builder.buildUnchecked();
         Assertions.assertThat(setDeleteDaysAfterLastModificationChange)
                 .isInstanceOf(SetDeleteDaysAfterLastModificationChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetDeleteDaysAfterLastModificationChange.builder().change("change") },
-                new Object[] { SetDeleteDaysAfterLastModificationChange.builder().previousValue(8) },
-                new Object[] { SetDeleteDaysAfterLastModificationChange.builder().nextValue(7) } };
+        return new Object[][] {
+                new Object[] { "change", SetDeleteDaysAfterLastModificationChange.builder().change("change") },
+                new Object[] { "previousValue", SetDeleteDaysAfterLastModificationChange.builder().previousValue(8) },
+                new Object[] { "nextValue", SetDeleteDaysAfterLastModificationChange.builder().nextValue(7) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDeliveryAddressChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDeliveryAddressChangeTest.java
index 9827a9ee390..b0bf6074046 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDeliveryAddressChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDeliveryAddressChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetDeliveryAddressChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetDeliveryAddressChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetDeliveryAddressChangeBuilder builder) {
         SetDeliveryAddressChange setDeliveryAddressChange = builder.buildUnchecked();
         Assertions.assertThat(setDeliveryAddressChange).isInstanceOf(SetDeliveryAddressChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetDeliveryAddressChange.builder().change("change") },
-                new Object[] { SetDeliveryAddressChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { SetDeliveryAddressChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { SetDeliveryAddressChange.builder().deliveryId("deliveryId") } };
+        return new Object[][] { new Object[] { "change", SetDeliveryAddressChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetDeliveryAddressChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "nextValue",
+                        SetDeliveryAddressChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "deliveryId", SetDeliveryAddressChange.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDeliveryItemsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDeliveryItemsChangeTest.java
index b31b6eb9b33..0ca82053e8b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDeliveryItemsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDeliveryItemsChangeTest.java
@@ -3,37 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetDeliveryItemsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetDeliveryItemsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetDeliveryItemsChangeBuilder builder) {
         SetDeliveryItemsChange setDeliveryItemsChange = builder.buildUnchecked();
         Assertions.assertThat(setDeliveryItemsChange).isInstanceOf(SetDeliveryItemsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetDeliveryItemsChange.builder().change("change") },
-                new Object[] { SetDeliveryItemsChange.builder()
-                        .previousValue(Collections
-                                .singletonList(new com.commercetools.history.models.common.DeliveryItemImpl())) },
-                new Object[] { SetDeliveryItemsChange.builder()
-                        .nextValue(Collections
-                                .singletonList(new com.commercetools.history.models.common.DeliveryItemImpl())) },
-                new Object[] { SetDeliveryItemsChange.builder().deliveryId("deliveryId") } };
+        return new Object[][] { new Object[] { "change", SetDeliveryItemsChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetDeliveryItemsChange.builder()
+                                .previousValue(Collections.singletonList(
+                                    new com.commercetools.history.models.common.DeliveryItemImpl())) },
+                new Object[] { "nextValue",
+                        SetDeliveryItemsChange.builder()
+                                .nextValue(Collections.singletonList(
+                                    new com.commercetools.history.models.common.DeliveryItemImpl())) },
+                new Object[] { "deliveryId", SetDeliveryItemsChange.builder().deliveryId("deliveryId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDescriptionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDescriptionChangeTest.java
index dadd01a0f3a..3e19e4136b1 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDescriptionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDescriptionChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetDescriptionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetDescriptionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetDescriptionChangeBuilder builder) {
         SetDescriptionChange setDescriptionChange = builder.buildUnchecked();
         Assertions.assertThat(setDescriptionChange).isInstanceOf(SetDescriptionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetDescriptionChange.builder().change("change") },
-                new Object[] { SetDescriptionChange.builder().previousValue("previousValue") },
-                new Object[] { SetDescriptionChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetDescriptionChange.builder().change("change") },
+                new Object[] { "previousValue", SetDescriptionChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetDescriptionChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDiscountedPriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDiscountedPriceChangeTest.java
index 98675cdeea8..45f25476865 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDiscountedPriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDiscountedPriceChangeTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetDiscountedPriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetDiscountedPriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetDiscountedPriceChangeBuilder builder) {
         SetDiscountedPriceChange setDiscountedPriceChange = builder.buildUnchecked();
         Assertions.assertThat(setDiscountedPriceChange).isInstanceOf(SetDiscountedPriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetDiscountedPriceChange.builder().change("change") },
-                new Object[] { SetDiscountedPriceChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.PriceImpl()) },
-                new Object[] { SetDiscountedPriceChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.PriceImpl()) },
-                new Object[] { SetDiscountedPriceChange.builder().catalogData("catalogData") },
-                new Object[] { SetDiscountedPriceChange.builder().variant("variant") },
-                new Object[] { SetDiscountedPriceChange.builder().priceId("priceId") } };
+        return new Object[][] { new Object[] { "change", SetDiscountedPriceChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetDiscountedPriceChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.PriceImpl()) },
+                new Object[] { "nextValue",
+                        SetDiscountedPriceChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.PriceImpl()) },
+                new Object[] { "catalogData", SetDiscountedPriceChange.builder().catalogData("catalogData") },
+                new Object[] { "variant", SetDiscountedPriceChange.builder().variant("variant") },
+                new Object[] { "priceId", SetDiscountedPriceChange.builder().priceId("priceId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDistributionChannelsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDistributionChannelsChangeTest.java
index 08ff87c808a..6e5a58a96ed 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDistributionChannelsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetDistributionChannelsChangeTest.java
@@ -3,35 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetDistributionChannelsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetDistributionChannelsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetDistributionChannelsChangeBuilder builder) {
         SetDistributionChannelsChange setDistributionChannelsChange = builder.buildUnchecked();
         Assertions.assertThat(setDistributionChannelsChange).isInstanceOf(SetDistributionChannelsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetDistributionChannelsChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", SetDistributionChannelsChange.builder().change("change") },
+                new Object[] { "previousValue",
                         SetDistributionChannelsChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ReferenceImpl())) },
-                new Object[] { SetDistributionChannelsChange.builder()
+                new Object[] { "nextValue", SetDistributionChannelsChange.builder()
                         .nextValue(
                             Collections.singletonList(new com.commercetools.history.models.common.ReferenceImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetExpectedDeliveryChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetExpectedDeliveryChangeTest.java
index 07f206b808e..0d136745345 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetExpectedDeliveryChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetExpectedDeliveryChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetExpectedDeliveryChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetExpectedDeliveryChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetExpectedDeliveryChangeBuilder builder) {
         SetExpectedDeliveryChange setExpectedDeliveryChange = builder.buildUnchecked();
         Assertions.assertThat(setExpectedDeliveryChange).isInstanceOf(SetExpectedDeliveryChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetExpectedDeliveryChange.builder().change("change") },
-                new Object[] { SetExpectedDeliveryChange.builder().previousValue("previousValue") },
-                new Object[] { SetExpectedDeliveryChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetExpectedDeliveryChange.builder().change("change") },
+                new Object[] { "previousValue", SetExpectedDeliveryChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetExpectedDeliveryChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetExternalIdChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetExternalIdChangeTest.java
index 14c644ca7ff..57f99984f34 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetExternalIdChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetExternalIdChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetExternalIdChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetExternalIdChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetExternalIdChangeBuilder builder) {
         SetExternalIdChange setExternalIdChange = builder.buildUnchecked();
         Assertions.assertThat(setExternalIdChange).isInstanceOf(SetExternalIdChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetExternalIdChange.builder().change("change") },
-                new Object[] { SetExternalIdChange.builder().previousValue("previousValue") },
-                new Object[] { SetExternalIdChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetExternalIdChange.builder().change("change") },
+                new Object[] { "previousValue", SetExternalIdChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetExternalIdChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetFirstNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetFirstNameChangeTest.java
index 2a050b3d798..d4435384bff 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetFirstNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetFirstNameChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetFirstNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetFirstNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetFirstNameChangeBuilder builder) {
         SetFirstNameChange setFirstNameChange = builder.buildUnchecked();
         Assertions.assertThat(setFirstNameChange).isInstanceOf(SetFirstNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetFirstNameChange.builder().change("change") },
-                new Object[] { SetFirstNameChange.builder().previousValue("previousValue") },
-                new Object[] { SetFirstNameChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetFirstNameChange.builder().change("change") },
+                new Object[] { "previousValue", SetFirstNameChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetFirstNameChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetGeoLocationChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetGeoLocationChangeTest.java
index ebc72f5523d..6cf6bf496d9 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetGeoLocationChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetGeoLocationChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetGeoLocationChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetGeoLocationChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetGeoLocationChangeBuilder builder) {
         SetGeoLocationChange setGeoLocationChange = builder.buildUnchecked();
         Assertions.assertThat(setGeoLocationChange).isInstanceOf(SetGeoLocationChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetGeoLocationChange.builder().change("change") },
-                new Object[] { SetGeoLocationChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.GeoLocationImpl()) },
-                new Object[] { SetGeoLocationChange.builder()
+        return new Object[][] { new Object[] { "change", SetGeoLocationChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetGeoLocationChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.GeoLocationImpl()) },
+                new Object[] { "nextValue", SetGeoLocationChange.builder()
                         .nextValue(new com.commercetools.history.models.common.GeoLocationImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetImageLabelChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetImageLabelChangeTest.java
index 26a9b1077eb..8fcfddbe23e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetImageLabelChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetImageLabelChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetImageLabelChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetImageLabelChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetImageLabelChangeBuilder builder) {
         SetImageLabelChange setImageLabelChange = builder.buildUnchecked();
         Assertions.assertThat(setImageLabelChange).isInstanceOf(SetImageLabelChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetImageLabelChange.builder().change("change") },
-                new Object[] { SetImageLabelChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ImageImpl()) },
-                new Object[] { SetImageLabelChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.ImageImpl()) },
-                new Object[] { SetImageLabelChange.builder().catalogData("catalogData") } };
+        return new Object[][] { new Object[] { "change", SetImageLabelChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetImageLabelChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ImageImpl()) },
+                new Object[] { "nextValue",
+                        SetImageLabelChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.ImageImpl()) },
+                new Object[] { "catalogData", SetImageLabelChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetInputTipChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetInputTipChangeTest.java
index 4141f7e9c3a..d37b5416bdf 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetInputTipChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetInputTipChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetInputTipChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetInputTipChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetInputTipChangeBuilder builder) {
         SetInputTipChange setInputTipChange = builder.buildUnchecked();
         Assertions.assertThat(setInputTipChange).isInstanceOf(SetInputTipChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetInputTipChange.builder().change("change") },
-                new Object[] { SetInputTipChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetInputTipChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetInputTipChange.builder().attributeName("attributeName") } };
+        return new Object[][] { new Object[] { "change", SetInputTipChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetInputTipChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue",
+                        SetInputTipChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "attributeName", SetInputTipChange.builder().attributeName("attributeName") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetInterfaceIdChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetInterfaceIdChangeTest.java
index 9f689408400..9220c3609e5 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetInterfaceIdChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetInterfaceIdChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetInterfaceIdChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetInterfaceIdChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetInterfaceIdChangeBuilder builder) {
         SetInterfaceIdChange setInterfaceIdChange = builder.buildUnchecked();
         Assertions.assertThat(setInterfaceIdChange).isInstanceOf(SetInterfaceIdChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetInterfaceIdChange.builder().change("change") },
-                new Object[] { SetInterfaceIdChange.builder().previousValue("previousValue") },
-                new Object[] { SetInterfaceIdChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetInterfaceIdChange.builder().change("change") },
+                new Object[] { "previousValue", SetInterfaceIdChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetInterfaceIdChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetIsValidChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetIsValidChangeTest.java
index 0f440151b97..e3814ecced5 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetIsValidChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetIsValidChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetIsValidChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetIsValidChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetIsValidChangeBuilder builder) {
         SetIsValidChange setIsValidChange = builder.buildUnchecked();
         Assertions.assertThat(setIsValidChange).isInstanceOf(SetIsValidChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetIsValidChange.builder().change("change") },
-                new Object[] { SetIsValidChange.builder().previousValue(true) },
-                new Object[] { SetIsValidChange.builder().nextValue(true) } };
+        return new Object[][] { new Object[] { "change", SetIsValidChange.builder().change("change") },
+                new Object[] { "previousValue", SetIsValidChange.builder().previousValue(true) },
+                new Object[] { "nextValue", SetIsValidChange.builder().nextValue(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetKeyChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetKeyChangeTest.java
index 61871ed9bed..2946d769da4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetKeyChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetKeyChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetKeyChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetKeyChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetKeyChangeBuilder builder) {
         SetKeyChange setKeyChange = builder.buildUnchecked();
         Assertions.assertThat(setKeyChange).isInstanceOf(SetKeyChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetKeyChange.builder().change("change") },
-                new Object[] { SetKeyChange.builder().previousValue("previousValue") },
-                new Object[] { SetKeyChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetKeyChange.builder().change("change") },
+                new Object[] { "previousValue", SetKeyChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetKeyChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLanguagesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLanguagesChangeTest.java
index 1cb8cb89644..7ee41df694c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLanguagesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLanguagesChangeTest.java
@@ -3,32 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLanguagesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLanguagesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLanguagesChangeBuilder builder) {
         SetLanguagesChange setLanguagesChange = builder.buildUnchecked();
         Assertions.assertThat(setLanguagesChange).isInstanceOf(SetLanguagesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLanguagesChange.builder().change("change") },
-                new Object[] { SetLanguagesChange.builder().previousValue(Collections.singletonList("previousValue")) },
-                new Object[] { SetLanguagesChange.builder().nextValue(Collections.singletonList("nextValue")) } };
+        return new Object[][] { new Object[] { "change", SetLanguagesChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetLanguagesChange.builder().previousValue(Collections.singletonList("previousValue")) },
+                new Object[] { "nextValue",
+                        SetLanguagesChange.builder().nextValue(Collections.singletonList("nextValue")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLastNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLastNameChangeTest.java
index 999819028c0..9f5625e6cc6 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLastNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLastNameChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLastNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLastNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLastNameChangeBuilder builder) {
         SetLastNameChange setLastNameChange = builder.buildUnchecked();
         Assertions.assertThat(setLastNameChange).isInstanceOf(SetLastNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLastNameChange.builder().change("change") },
-                new Object[] { SetLastNameChange.builder().previousValue("previousValue") },
-                new Object[] { SetLastNameChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetLastNameChange.builder().change("change") },
+                new Object[] { "previousValue", SetLastNameChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetLastNameChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDeactivatedAtChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDeactivatedAtChangeTest.java
index 4202240841e..8eb77d27e65 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDeactivatedAtChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDeactivatedAtChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLineItemDeactivatedAtChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLineItemDeactivatedAtChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLineItemDeactivatedAtChangeBuilder builder) {
         SetLineItemDeactivatedAtChange setLineItemDeactivatedAtChange = builder.buildUnchecked();
         Assertions.assertThat(setLineItemDeactivatedAtChange).isInstanceOf(SetLineItemDeactivatedAtChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLineItemDeactivatedAtChange.builder().change("change") },
-                new Object[] { SetLineItemDeactivatedAtChange.builder().previousValue("previousValue") },
-                new Object[] { SetLineItemDeactivatedAtChange.builder().nextValue("nextValue") },
-                new Object[] { SetLineItemDeactivatedAtChange.builder()
+        return new Object[][] { new Object[] { "change", SetLineItemDeactivatedAtChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetLineItemDeactivatedAtChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetLineItemDeactivatedAtChange.builder().nextValue("nextValue") },
+                new Object[] { "lineItem", SetLineItemDeactivatedAtChange.builder()
                         .lineItem(
                             new com.commercetools.history.models.change_value.ShoppingListLineItemValueImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDiscountedPriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDiscountedPriceChangeTest.java
index fff60b035db..ad180675f5b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDiscountedPriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDiscountedPriceChangeTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLineItemDiscountedPriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLineItemDiscountedPriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLineItemDiscountedPriceChangeBuilder builder) {
         SetLineItemDiscountedPriceChange setLineItemDiscountedPriceChange = builder.buildUnchecked();
         Assertions.assertThat(setLineItemDiscountedPriceChange).isInstanceOf(SetLineItemDiscountedPriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLineItemDiscountedPriceChange.builder().change("change") },
-                new Object[] { SetLineItemDiscountedPriceChange.builder()
+        return new Object[][] { new Object[] { "change", SetLineItemDiscountedPriceChange.builder().change("change") },
+                new Object[] { "previousValue", SetLineItemDiscountedPriceChange.builder()
                         .previousValue(new com.commercetools.history.models.common.DiscountedLineItemPriceImpl()) },
-                new Object[] { SetLineItemDiscountedPriceChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.DiscountedLineItemPriceImpl()) },
-                new Object[] { SetLineItemDiscountedPriceChange.builder()
-                        .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetLineItemDiscountedPriceChange.builder().variant("variant") } };
+                new Object[] { "nextValue",
+                        SetLineItemDiscountedPriceChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.DiscountedLineItemPriceImpl()) },
+                new Object[] { "lineItem",
+                        SetLineItemDiscountedPriceChange.builder()
+                                .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "variant", SetLineItemDiscountedPriceChange.builder().variant("variant") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDiscountedPricePerQuantityChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDiscountedPricePerQuantityChangeTest.java
index 74ca41d02f7..00a850b5bad 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDiscountedPricePerQuantityChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDiscountedPricePerQuantityChangeTest.java
@@ -1,41 +1,35 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLineItemDiscountedPricePerQuantityChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLineItemDiscountedPricePerQuantityChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLineItemDiscountedPricePerQuantityChangeBuilder builder) {
         SetLineItemDiscountedPricePerQuantityChange setLineItemDiscountedPricePerQuantityChange = builder
                 .buildUnchecked();
         Assertions.assertThat(setLineItemDiscountedPricePerQuantityChange)
                 .isInstanceOf(SetLineItemDiscountedPricePerQuantityChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLineItemDiscountedPricePerQuantityChange.builder().change("change") },
-                new Object[] { SetLineItemDiscountedPricePerQuantityChange.builder()
+        return new Object[][] {
+                new Object[] { "change", SetLineItemDiscountedPricePerQuantityChange.builder().change("change") },
+                new Object[] { "previousValue", SetLineItemDiscountedPricePerQuantityChange.builder()
                         .previousValue(
                             new com.commercetools.history.models.common.DiscountedLineItemPriceForQuantityImpl()) },
-                new Object[] { SetLineItemDiscountedPricePerQuantityChange.builder()
+                new Object[] { "nextValue", SetLineItemDiscountedPricePerQuantityChange.builder()
                         .nextValue(
                             new com.commercetools.history.models.common.DiscountedLineItemPriceForQuantityImpl()) },
-                new Object[] { SetLineItemDiscountedPricePerQuantityChange.builder()
-                        .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetLineItemDiscountedPricePerQuantityChange.builder().variant("variant") } };
+                new Object[] { "lineItem",
+                        SetLineItemDiscountedPricePerQuantityChange.builder()
+                                .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "variant", SetLineItemDiscountedPricePerQuantityChange.builder().variant("variant") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDistributionChannelChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDistributionChannelChangeTest.java
index e3883c1f2d8..2f87366874e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDistributionChannelChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemDistributionChannelChangeTest.java
@@ -1,38 +1,34 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLineItemDistributionChannelChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLineItemDistributionChannelChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLineItemDistributionChannelChangeBuilder builder) {
         SetLineItemDistributionChannelChange setLineItemDistributionChannelChange = builder.buildUnchecked();
         Assertions.assertThat(setLineItemDistributionChannelChange)
                 .isInstanceOf(SetLineItemDistributionChannelChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLineItemDistributionChannelChange.builder().change("change") },
-                new Object[] { SetLineItemDistributionChannelChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { SetLineItemDistributionChannelChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { SetLineItemDistributionChannelChange.builder()
-                        .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetLineItemDistributionChannelChange.builder().variant("variant") } };
+        return new Object[][] {
+                new Object[] { "change", SetLineItemDistributionChannelChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetLineItemDistributionChannelChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "nextValue",
+                        SetLineItemDistributionChannelChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "lineItem",
+                        SetLineItemDistributionChannelChange.builder()
+                                .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "variant", SetLineItemDistributionChannelChange.builder().variant("variant") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemPriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemPriceChangeTest.java
index 62da7bfa963..1a0f6bfd660 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemPriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemPriceChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLineItemPriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLineItemPriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLineItemPriceChangeBuilder builder) {
         SetLineItemPriceChange setLineItemPriceChange = builder.buildUnchecked();
         Assertions.assertThat(setLineItemPriceChange).isInstanceOf(SetLineItemPriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLineItemPriceChange.builder().change("change") },
-                new Object[] { SetLineItemPriceChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.PriceImpl()) },
-                new Object[] { SetLineItemPriceChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.PriceImpl()) },
-                new Object[] { SetLineItemPriceChange.builder()
+        return new Object[][] { new Object[] { "change", SetLineItemPriceChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetLineItemPriceChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.PriceImpl()) },
+                new Object[] { "nextValue",
+                        SetLineItemPriceChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.PriceImpl()) },
+                new Object[] { "lineItem", SetLineItemPriceChange.builder()
                         .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemProductKeyChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemProductKeyChangeTest.java
index 612f8d66359..edd00c6b83b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemProductKeyChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemProductKeyChangeTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLineItemProductKeyChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLineItemProductKeyChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLineItemProductKeyChangeBuilder builder) {
         SetLineItemProductKeyChange setLineItemProductKeyChange = builder.buildUnchecked();
         Assertions.assertThat(setLineItemProductKeyChange).isInstanceOf(SetLineItemProductKeyChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLineItemProductKeyChange.builder().change("change") },
-                new Object[] { SetLineItemProductKeyChange.builder().previousValue("previousValue") },
-                new Object[] { SetLineItemProductKeyChange.builder().nextValue("nextValue") },
-                new Object[] { SetLineItemProductKeyChange.builder()
-                        .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetLineItemProductKeyChange.builder().lineItemId("lineItemId") },
-                new Object[] { SetLineItemProductKeyChange.builder().variant("variant") } };
+        return new Object[][] { new Object[] { "change", SetLineItemProductKeyChange.builder().change("change") },
+                new Object[] { "previousValue", SetLineItemProductKeyChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetLineItemProductKeyChange.builder().nextValue("nextValue") },
+                new Object[] { "lineItem",
+                        SetLineItemProductKeyChange.builder()
+                                .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "lineItemId", SetLineItemProductKeyChange.builder().lineItemId("lineItemId") },
+                new Object[] { "variant", SetLineItemProductKeyChange.builder().variant("variant") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemProductSlugChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemProductSlugChangeTest.java
index 373b47db160..cd1cb600671 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemProductSlugChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemProductSlugChangeTest.java
@@ -1,37 +1,32 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLineItemProductSlugChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLineItemProductSlugChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLineItemProductSlugChangeBuilder builder) {
         SetLineItemProductSlugChange setLineItemProductSlugChange = builder.buildUnchecked();
         Assertions.assertThat(setLineItemProductSlugChange).isInstanceOf(SetLineItemProductSlugChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLineItemProductSlugChange.builder().change("change") },
-                new Object[] { SetLineItemProductSlugChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetLineItemProductSlugChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetLineItemProductSlugChange.builder()
-                        .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetLineItemProductSlugChange.builder().variant("variant") } };
+        return new Object[][] { new Object[] { "change", SetLineItemProductSlugChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetLineItemProductSlugChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue",
+                        SetLineItemProductSlugChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "lineItem",
+                        SetLineItemProductSlugChange.builder()
+                                .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "variant", SetLineItemProductSlugChange.builder().variant("variant") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemShippingDetailsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemShippingDetailsChangeTest.java
index 64422032c35..1ced7a5a505 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemShippingDetailsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemShippingDetailsChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLineItemShippingDetailsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLineItemShippingDetailsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLineItemShippingDetailsChangeBuilder builder) {
         SetLineItemShippingDetailsChange setLineItemShippingDetailsChange = builder.buildUnchecked();
         Assertions.assertThat(setLineItemShippingDetailsChange).isInstanceOf(SetLineItemShippingDetailsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLineItemShippingDetailsChange.builder().change("change") },
-                new Object[] { SetLineItemShippingDetailsChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ItemShippingDetailsImpl()) },
-                new Object[] { SetLineItemShippingDetailsChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.ItemShippingDetailsImpl()) },
-                new Object[] { SetLineItemShippingDetailsChange.builder().lineItemId("lineItemId") } };
+        return new Object[][] { new Object[] { "change", SetLineItemShippingDetailsChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetLineItemShippingDetailsChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ItemShippingDetailsImpl()) },
+                new Object[] { "nextValue",
+                        SetLineItemShippingDetailsChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.ItemShippingDetailsImpl()) },
+                new Object[] { "lineItemId", SetLineItemShippingDetailsChange.builder().lineItemId("lineItemId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTaxAmountChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTaxAmountChangeTest.java
index ee3ae2ffcc5..ea0a951de6f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTaxAmountChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTaxAmountChangeTest.java
@@ -1,38 +1,33 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLineItemTaxAmountChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLineItemTaxAmountChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLineItemTaxAmountChangeBuilder builder) {
         SetLineItemTaxAmountChange setLineItemTaxAmountChange = builder.buildUnchecked();
         Assertions.assertThat(setLineItemTaxAmountChange).isInstanceOf(SetLineItemTaxAmountChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLineItemTaxAmountChange.builder().change("change") },
-                new Object[] { SetLineItemTaxAmountChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) },
-                new Object[] { SetLineItemTaxAmountChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.TaxRateImpl()) },
-                new Object[] { SetLineItemTaxAmountChange.builder()
-                        .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetLineItemTaxAmountChange.builder().variant("variant") },
-                new Object[] { SetLineItemTaxAmountChange.builder()
+        return new Object[][] { new Object[] { "change", SetLineItemTaxAmountChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetLineItemTaxAmountChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) },
+                new Object[] { "nextValue",
+                        SetLineItemTaxAmountChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.TaxRateImpl()) },
+                new Object[] { "lineItem",
+                        SetLineItemTaxAmountChange.builder()
+                                .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "variant", SetLineItemTaxAmountChange.builder().variant("variant") },
+                new Object[] { "taxMode", SetLineItemTaxAmountChange.builder()
                         .taxMode(com.commercetools.history.models.common.TaxMode.findEnum("Platform")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTaxRateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTaxRateChangeTest.java
index d149faef6cc..721b0889cd0 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTaxRateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTaxRateChangeTest.java
@@ -1,38 +1,33 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLineItemTaxRateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLineItemTaxRateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLineItemTaxRateChangeBuilder builder) {
         SetLineItemTaxRateChange setLineItemTaxRateChange = builder.buildUnchecked();
         Assertions.assertThat(setLineItemTaxRateChange).isInstanceOf(SetLineItemTaxRateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLineItemTaxRateChange.builder().change("change") },
-                new Object[] { SetLineItemTaxRateChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) },
-                new Object[] { SetLineItemTaxRateChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.TaxRateImpl()) },
-                new Object[] { SetLineItemTaxRateChange.builder()
-                        .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetLineItemTaxRateChange.builder().variant("variant") },
-                new Object[] { SetLineItemTaxRateChange.builder()
+        return new Object[][] { new Object[] { "change", SetLineItemTaxRateChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetLineItemTaxRateChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) },
+                new Object[] { "nextValue",
+                        SetLineItemTaxRateChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.TaxRateImpl()) },
+                new Object[] { "lineItem",
+                        SetLineItemTaxRateChange.builder()
+                                .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "variant", SetLineItemTaxRateChange.builder().variant("variant") },
+                new Object[] { "taxMode", SetLineItemTaxRateChange.builder()
                         .taxMode(com.commercetools.history.models.common.TaxMode.findEnum("Platform")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTaxedPriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTaxedPriceChangeTest.java
index 18d9544ccfe..c46755ae428 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTaxedPriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTaxedPriceChangeTest.java
@@ -1,37 +1,32 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLineItemTaxedPriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLineItemTaxedPriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLineItemTaxedPriceChangeBuilder builder) {
         SetLineItemTaxedPriceChange setLineItemTaxedPriceChange = builder.buildUnchecked();
         Assertions.assertThat(setLineItemTaxedPriceChange).isInstanceOf(SetLineItemTaxedPriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLineItemTaxedPriceChange.builder().change("change") },
-                new Object[] { SetLineItemTaxedPriceChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.TaxedItemPriceImpl()) },
-                new Object[] { SetLineItemTaxedPriceChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.TaxedItemPriceImpl()) },
-                new Object[] { SetLineItemTaxedPriceChange.builder()
-                        .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetLineItemTaxedPriceChange.builder().lineItemId("lineItemId") } };
+        return new Object[][] { new Object[] { "change", SetLineItemTaxedPriceChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetLineItemTaxedPriceChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.TaxedItemPriceImpl()) },
+                new Object[] { "nextValue",
+                        SetLineItemTaxedPriceChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.TaxedItemPriceImpl()) },
+                new Object[] { "lineItem",
+                        SetLineItemTaxedPriceChange.builder()
+                                .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "lineItemId", SetLineItemTaxedPriceChange.builder().lineItemId("lineItemId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTotalPriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTotalPriceChangeTest.java
index ac17477f12e..43b0957307f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTotalPriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLineItemTotalPriceChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLineItemTotalPriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLineItemTotalPriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLineItemTotalPriceChangeBuilder builder) {
         SetLineItemTotalPriceChange setLineItemTotalPriceChange = builder.buildUnchecked();
         Assertions.assertThat(setLineItemTotalPriceChange).isInstanceOf(SetLineItemTotalPriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLineItemTotalPriceChange.builder().change("change") },
-                new Object[] { SetLineItemTotalPriceChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetLineItemTotalPriceChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetLineItemTotalPriceChange.builder()
+        return new Object[][] { new Object[] { "change", SetLineItemTotalPriceChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetLineItemTotalPriceChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "nextValue",
+                        SetLineItemTotalPriceChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "lineItem", SetLineItemTotalPriceChange.builder()
                         .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLocaleChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLocaleChangeTest.java
index 3b374ed10fe..7a5b3efaa78 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLocaleChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLocaleChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLocaleChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLocaleChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLocaleChangeBuilder builder) {
         SetLocaleChange setLocaleChange = builder.buildUnchecked();
         Assertions.assertThat(setLocaleChange).isInstanceOf(SetLocaleChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLocaleChange.builder().change("change") },
-                new Object[] { SetLocaleChange.builder().previousValue("previousValue") },
-                new Object[] { SetLocaleChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetLocaleChange.builder().change("change") },
+                new Object[] { "previousValue", SetLocaleChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetLocaleChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLocalizedDescriptionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLocalizedDescriptionChangeTest.java
index 882194eaab9..6ac00217725 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLocalizedDescriptionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLocalizedDescriptionChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLocalizedDescriptionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLocalizedDescriptionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLocalizedDescriptionChangeBuilder builder) {
         SetLocalizedDescriptionChange setLocalizedDescriptionChange = builder.buildUnchecked();
         Assertions.assertThat(setLocalizedDescriptionChange).isInstanceOf(SetLocalizedDescriptionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLocalizedDescriptionChange.builder().change("change") },
-                new Object[] { SetLocalizedDescriptionChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetLocalizedDescriptionChange.builder()
+        return new Object[][] { new Object[] { "change", SetLocalizedDescriptionChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetLocalizedDescriptionChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue", SetLocalizedDescriptionChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLocalizedNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLocalizedNameChangeTest.java
index c4b3f4d8401..1f76e77cb1e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLocalizedNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetLocalizedNameChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetLocalizedNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetLocalizedNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetLocalizedNameChangeBuilder builder) {
         SetLocalizedNameChange setLocalizedNameChange = builder.buildUnchecked();
         Assertions.assertThat(setLocalizedNameChange).isInstanceOf(SetLocalizedNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetLocalizedNameChange.builder().change("change") },
-                new Object[] { SetLocalizedNameChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetLocalizedNameChange.builder()
+        return new Object[][] { new Object[] { "change", SetLocalizedNameChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetLocalizedNameChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue", SetLocalizedNameChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMaxApplicationsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMaxApplicationsChangeTest.java
index 0a08149f44e..86743847de9 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMaxApplicationsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMaxApplicationsChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetMaxApplicationsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetMaxApplicationsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetMaxApplicationsChangeBuilder builder) {
         SetMaxApplicationsChange setMaxApplicationsChange = builder.buildUnchecked();
         Assertions.assertThat(setMaxApplicationsChange).isInstanceOf(SetMaxApplicationsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetMaxApplicationsChange.builder().change("change") },
-                new Object[] { SetMaxApplicationsChange.builder().previousValue(8) },
-                new Object[] { SetMaxApplicationsChange.builder().nextValue(7) } };
+        return new Object[][] { new Object[] { "change", SetMaxApplicationsChange.builder().change("change") },
+                new Object[] { "previousValue", SetMaxApplicationsChange.builder().previousValue(8) },
+                new Object[] { "nextValue", SetMaxApplicationsChange.builder().nextValue(7) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMaxApplicationsPerCustomerChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMaxApplicationsPerCustomerChangeTest.java
index f6b89fd8413..51a71fef087 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMaxApplicationsPerCustomerChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMaxApplicationsPerCustomerChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetMaxApplicationsPerCustomerChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetMaxApplicationsPerCustomerChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetMaxApplicationsPerCustomerChangeBuilder builder) {
         SetMaxApplicationsPerCustomerChange setMaxApplicationsPerCustomerChange = builder.buildUnchecked();
         Assertions.assertThat(setMaxApplicationsPerCustomerChange)
                 .isInstanceOf(SetMaxApplicationsPerCustomerChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetMaxApplicationsPerCustomerChange.builder().change("change") },
-                new Object[] { SetMaxApplicationsPerCustomerChange.builder().previousValue(8) },
-                new Object[] { SetMaxApplicationsPerCustomerChange.builder().nextValue(7) } };
+        return new Object[][] {
+                new Object[] { "change", SetMaxApplicationsPerCustomerChange.builder().change("change") },
+                new Object[] { "previousValue", SetMaxApplicationsPerCustomerChange.builder().previousValue(8) },
+                new Object[] { "nextValue", SetMaxApplicationsPerCustomerChange.builder().nextValue(7) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMetaDescriptionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMetaDescriptionChangeTest.java
index e5f0a103c98..7cb1cb9c1d9 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMetaDescriptionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMetaDescriptionChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetMetaDescriptionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetMetaDescriptionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetMetaDescriptionChangeBuilder builder) {
         SetMetaDescriptionChange setMetaDescriptionChange = builder.buildUnchecked();
         Assertions.assertThat(setMetaDescriptionChange).isInstanceOf(SetMetaDescriptionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetMetaDescriptionChange.builder().change("change") },
-                new Object[] { SetMetaDescriptionChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetMetaDescriptionChange.builder()
+        return new Object[][] { new Object[] { "change", SetMetaDescriptionChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetMetaDescriptionChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue", SetMetaDescriptionChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMetaKeywordsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMetaKeywordsChangeTest.java
index 58144e58820..d45d0db8884 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMetaKeywordsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMetaKeywordsChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetMetaKeywordsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetMetaKeywordsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetMetaKeywordsChangeBuilder builder) {
         SetMetaKeywordsChange setMetaKeywordsChange = builder.buildUnchecked();
         Assertions.assertThat(setMetaKeywordsChange).isInstanceOf(SetMetaKeywordsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetMetaKeywordsChange.builder().change("change") },
-                new Object[] { SetMetaKeywordsChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetMetaKeywordsChange.builder()
+        return new Object[][] { new Object[] { "change", SetMetaKeywordsChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetMetaKeywordsChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue", SetMetaKeywordsChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMetaTitleChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMetaTitleChangeTest.java
index 2aa33cf8778..7a0eaa4bbea 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMetaTitleChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMetaTitleChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetMetaTitleChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetMetaTitleChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetMetaTitleChangeBuilder builder) {
         SetMetaTitleChange setMetaTitleChange = builder.buildUnchecked();
         Assertions.assertThat(setMetaTitleChange).isInstanceOf(SetMetaTitleChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetMetaTitleChange.builder().change("change") },
-                new Object[] { SetMetaTitleChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetMetaTitleChange.builder()
+        return new Object[][] { new Object[] { "change", SetMetaTitleChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetMetaTitleChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue", SetMetaTitleChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMethodInfoInterfaceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMethodInfoInterfaceChangeTest.java
index 2addea02fc2..7e9e6068c74 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMethodInfoInterfaceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMethodInfoInterfaceChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetMethodInfoInterfaceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetMethodInfoInterfaceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetMethodInfoInterfaceChangeBuilder builder) {
         SetMethodInfoInterfaceChange setMethodInfoInterfaceChange = builder.buildUnchecked();
         Assertions.assertThat(setMethodInfoInterfaceChange).isInstanceOf(SetMethodInfoInterfaceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetMethodInfoInterfaceChange.builder().change("change") },
-                new Object[] { SetMethodInfoInterfaceChange.builder().previousValue("previousValue") },
-                new Object[] { SetMethodInfoInterfaceChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetMethodInfoInterfaceChange.builder().change("change") },
+                new Object[] { "previousValue", SetMethodInfoInterfaceChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetMethodInfoInterfaceChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMethodInfoMethodChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMethodInfoMethodChangeTest.java
index d4b8951acdd..6e2dacaa445 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMethodInfoMethodChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMethodInfoMethodChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetMethodInfoMethodChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetMethodInfoMethodChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetMethodInfoMethodChangeBuilder builder) {
         SetMethodInfoMethodChange setMethodInfoMethodChange = builder.buildUnchecked();
         Assertions.assertThat(setMethodInfoMethodChange).isInstanceOf(SetMethodInfoMethodChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetMethodInfoMethodChange.builder().change("change") },
-                new Object[] { SetMethodInfoMethodChange.builder().previousValue("previousValue") },
-                new Object[] { SetMethodInfoMethodChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetMethodInfoMethodChange.builder().change("change") },
+                new Object[] { "previousValue", SetMethodInfoMethodChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetMethodInfoMethodChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMethodInfoNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMethodInfoNameChangeTest.java
index b1b871dfb1c..ef919e0638e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMethodInfoNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMethodInfoNameChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetMethodInfoNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetMethodInfoNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetMethodInfoNameChangeBuilder builder) {
         SetMethodInfoNameChange setMethodInfoNameChange = builder.buildUnchecked();
         Assertions.assertThat(setMethodInfoNameChange).isInstanceOf(SetMethodInfoNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetMethodInfoNameChange.builder().change("change") },
-                new Object[] { SetMethodInfoNameChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetMethodInfoNameChange.builder()
+        return new Object[][] { new Object[] { "change", SetMethodInfoNameChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetMethodInfoNameChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue", SetMethodInfoNameChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMiddleNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMiddleNameChangeTest.java
index f1c5fa000a5..57bca7038fe 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMiddleNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetMiddleNameChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetMiddleNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetMiddleNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetMiddleNameChangeBuilder builder) {
         SetMiddleNameChange setMiddleNameChange = builder.buildUnchecked();
         Assertions.assertThat(setMiddleNameChange).isInstanceOf(SetMiddleNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetMiddleNameChange.builder().change("change") },
-                new Object[] { SetMiddleNameChange.builder().previousValue("previousValue") },
-                new Object[] { SetMiddleNameChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetMiddleNameChange.builder().change("change") },
+                new Object[] { "previousValue", SetMiddleNameChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetMiddleNameChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetNameChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetNameChangeTest.java
index b6624c2c96a..09c122a46a2 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetNameChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetNameChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetNameChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetNameChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetNameChangeBuilder builder) {
         SetNameChange setNameChange = builder.buildUnchecked();
         Assertions.assertThat(setNameChange).isInstanceOf(SetNameChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetNameChange.builder().change("change") },
-                new Object[] { SetNameChange.builder().previousValue("previousValue") },
-                new Object[] { SetNameChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetNameChange.builder().change("change") },
+                new Object[] { "previousValue", SetNameChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetNameChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderLineItemCustomFieldChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderLineItemCustomFieldChangeTest.java
index 1d55f9043f2..9101fff32c6 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderLineItemCustomFieldChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderLineItemCustomFieldChangeTest.java
@@ -1,37 +1,32 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetOrderLineItemCustomFieldChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetOrderLineItemCustomFieldChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetOrderLineItemCustomFieldChangeBuilder builder) {
         SetOrderLineItemCustomFieldChange setOrderLineItemCustomFieldChange = builder.buildUnchecked();
         Assertions.assertThat(setOrderLineItemCustomFieldChange).isInstanceOf(SetOrderLineItemCustomFieldChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetOrderLineItemCustomFieldChange.builder().change("change") },
-                new Object[] { SetOrderLineItemCustomFieldChange.builder().previousValue("previousValue") },
-                new Object[] { SetOrderLineItemCustomFieldChange.builder().nextValue("nextValue") },
-                new Object[] { SetOrderLineItemCustomFieldChange.builder().customTypeId("customTypeId") },
-                new Object[] { SetOrderLineItemCustomFieldChange.builder().name("name") },
-                new Object[] { SetOrderLineItemCustomFieldChange.builder()
-                        .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetOrderLineItemCustomFieldChange.builder().variant("variant") } };
+        return new Object[][] { new Object[] { "change", SetOrderLineItemCustomFieldChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetOrderLineItemCustomFieldChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetOrderLineItemCustomFieldChange.builder().nextValue("nextValue") },
+                new Object[] { "customTypeId",
+                        SetOrderLineItemCustomFieldChange.builder().customTypeId("customTypeId") },
+                new Object[] { "name", SetOrderLineItemCustomFieldChange.builder().name("name") },
+                new Object[] { "lineItem",
+                        SetOrderLineItemCustomFieldChange.builder()
+                                .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "variant", SetOrderLineItemCustomFieldChange.builder().variant("variant") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderLineItemCustomTypeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderLineItemCustomTypeChangeTest.java
index 8fa9ba21aa4..25e8dc100d9 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderLineItemCustomTypeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderLineItemCustomTypeChangeTest.java
@@ -1,37 +1,32 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetOrderLineItemCustomTypeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetOrderLineItemCustomTypeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetOrderLineItemCustomTypeChangeBuilder builder) {
         SetOrderLineItemCustomTypeChange setOrderLineItemCustomTypeChange = builder.buildUnchecked();
         Assertions.assertThat(setOrderLineItemCustomTypeChange).isInstanceOf(SetOrderLineItemCustomTypeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetOrderLineItemCustomTypeChange.builder().change("change") },
-                new Object[] { SetOrderLineItemCustomTypeChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetOrderLineItemCustomTypeChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetOrderLineItemCustomTypeChange.builder()
-                        .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetOrderLineItemCustomTypeChange.builder().variant("variant") } };
+        return new Object[][] { new Object[] { "change", SetOrderLineItemCustomTypeChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetOrderLineItemCustomTypeChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "nextValue",
+                        SetOrderLineItemCustomTypeChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "lineItem",
+                        SetOrderLineItemCustomTypeChange.builder()
+                                .lineItem(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "variant", SetOrderLineItemCustomTypeChange.builder().variant("variant") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderNumberChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderNumberChangeTest.java
index efc5b832857..fa7467c9246 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderNumberChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderNumberChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetOrderNumberChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetOrderNumberChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetOrderNumberChangeBuilder builder) {
         SetOrderNumberChange setOrderNumberChange = builder.buildUnchecked();
         Assertions.assertThat(setOrderNumberChange).isInstanceOf(SetOrderNumberChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetOrderNumberChange.builder().change("change") },
-                new Object[] { SetOrderNumberChange.builder().previousValue("previousValue") },
-                new Object[] { SetOrderNumberChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetOrderNumberChange.builder().change("change") },
+                new Object[] { "previousValue", SetOrderNumberChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetOrderNumberChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderTaxedPriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderTaxedPriceChangeTest.java
index b2f61588d88..c63832aafcb 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderTaxedPriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderTaxedPriceChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetOrderTaxedPriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetOrderTaxedPriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetOrderTaxedPriceChangeBuilder builder) {
         SetOrderTaxedPriceChange setOrderTaxedPriceChange = builder.buildUnchecked();
         Assertions.assertThat(setOrderTaxedPriceChange).isInstanceOf(SetOrderTaxedPriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetOrderTaxedPriceChange.builder().change("change") },
-                new Object[] { SetOrderTaxedPriceChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.TaxedItemPriceImpl()) },
-                new Object[] { SetOrderTaxedPriceChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.TaxedItemPriceImpl()) },
-                new Object[] { SetOrderTaxedPriceChange.builder()
+        return new Object[][] { new Object[] { "change", SetOrderTaxedPriceChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetOrderTaxedPriceChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.TaxedItemPriceImpl()) },
+                new Object[] { "nextValue",
+                        SetOrderTaxedPriceChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.TaxedItemPriceImpl()) },
+                new Object[] { "taxMode", SetOrderTaxedPriceChange.builder()
                         .taxMode(com.commercetools.history.models.common.TaxMode.findEnum("Platform")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderTotalPriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderTotalPriceChangeTest.java
index 7144d625ca5..18d80eded26 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderTotalPriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderTotalPriceChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetOrderTotalPriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetOrderTotalPriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetOrderTotalPriceChangeBuilder builder) {
         SetOrderTotalPriceChange setOrderTotalPriceChange = builder.buildUnchecked();
         Assertions.assertThat(setOrderTotalPriceChange).isInstanceOf(SetOrderTotalPriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetOrderTotalPriceChange.builder().change("change") },
-                new Object[] { SetOrderTotalPriceChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetOrderTotalPriceChange.builder()
+        return new Object[][] { new Object[] { "change", SetOrderTotalPriceChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetOrderTotalPriceChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "nextValue", SetOrderTotalPriceChange.builder()
                         .nextValue(new com.commercetools.history.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderTotalTaxChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderTotalTaxChangeTest.java
index eca9f14b495..3e463cec35f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderTotalTaxChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetOrderTotalTaxChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetOrderTotalTaxChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetOrderTotalTaxChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetOrderTotalTaxChangeBuilder builder) {
         SetOrderTotalTaxChange setOrderTotalTaxChange = builder.buildUnchecked();
         Assertions.assertThat(setOrderTotalTaxChange).isInstanceOf(SetOrderTotalTaxChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetOrderTotalTaxChange.builder().change("change") },
-                new Object[] { SetOrderTotalTaxChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetOrderTotalTaxChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetOrderTotalTaxChange.builder()
+        return new Object[][] { new Object[] { "change", SetOrderTotalTaxChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetOrderTotalTaxChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "nextValue",
+                        SetOrderTotalTaxChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "taxMode", SetOrderTotalTaxChange.builder()
                         .taxMode(com.commercetools.history.models.common.TaxMode.findEnum("Platform")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetParcelItemsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetParcelItemsChangeTest.java
index 0a05427ef7d..cf25e6965b3 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetParcelItemsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetParcelItemsChangeTest.java
@@ -3,37 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetParcelItemsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetParcelItemsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetParcelItemsChangeBuilder builder) {
         SetParcelItemsChange setParcelItemsChange = builder.buildUnchecked();
         Assertions.assertThat(setParcelItemsChange).isInstanceOf(SetParcelItemsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetParcelItemsChange.builder().change("change") },
-                new Object[] { SetParcelItemsChange.builder()
-                        .previousValue(Collections
-                                .singletonList(new com.commercetools.history.models.common.DeliveryItemImpl())) },
-                new Object[] { SetParcelItemsChange.builder()
-                        .nextValue(Collections
-                                .singletonList(new com.commercetools.history.models.common.DeliveryItemImpl())) },
-                new Object[] { SetParcelItemsChange.builder()
+        return new Object[][] { new Object[] { "change", SetParcelItemsChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetParcelItemsChange.builder()
+                                .previousValue(Collections.singletonList(
+                                    new com.commercetools.history.models.common.DeliveryItemImpl())) },
+                new Object[] { "nextValue",
+                        SetParcelItemsChange.builder()
+                                .nextValue(Collections.singletonList(
+                                    new com.commercetools.history.models.common.DeliveryItemImpl())) },
+                new Object[] { "parcel", SetParcelItemsChange.builder()
                         .parcel(new com.commercetools.history.models.change_value.ParcelChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetParcelMeasurementsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetParcelMeasurementsChangeTest.java
index b4aa54325ae..030ec1c92d7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetParcelMeasurementsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetParcelMeasurementsChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetParcelMeasurementsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetParcelMeasurementsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetParcelMeasurementsChangeBuilder builder) {
         SetParcelMeasurementsChange setParcelMeasurementsChange = builder.buildUnchecked();
         Assertions.assertThat(setParcelMeasurementsChange).isInstanceOf(SetParcelMeasurementsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetParcelMeasurementsChange.builder().change("change") },
-                new Object[] { SetParcelMeasurementsChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ParcelMeasurementsImpl()) },
-                new Object[] { SetParcelMeasurementsChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.ParcelMeasurementsImpl()) },
-                new Object[] { SetParcelMeasurementsChange.builder()
+        return new Object[][] { new Object[] { "change", SetParcelMeasurementsChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetParcelMeasurementsChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ParcelMeasurementsImpl()) },
+                new Object[] { "nextValue",
+                        SetParcelMeasurementsChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.ParcelMeasurementsImpl()) },
+                new Object[] { "parcel", SetParcelMeasurementsChange.builder()
                         .parcel(new com.commercetools.history.models.change_value.ParcelChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetParcelTrackingDataChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetParcelTrackingDataChangeTest.java
index e1b17badc44..36ae884d1bf 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetParcelTrackingDataChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetParcelTrackingDataChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetParcelTrackingDataChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetParcelTrackingDataChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetParcelTrackingDataChangeBuilder builder) {
         SetParcelTrackingDataChange setParcelTrackingDataChange = builder.buildUnchecked();
         Assertions.assertThat(setParcelTrackingDataChange).isInstanceOf(SetParcelTrackingDataChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetParcelTrackingDataChange.builder().change("change") },
-                new Object[] { SetParcelTrackingDataChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.TrackingDataImpl()) },
-                new Object[] { SetParcelTrackingDataChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.TrackingDataImpl()) },
-                new Object[] { SetParcelTrackingDataChange.builder()
+        return new Object[][] { new Object[] { "change", SetParcelTrackingDataChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetParcelTrackingDataChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.TrackingDataImpl()) },
+                new Object[] { "nextValue",
+                        SetParcelTrackingDataChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.TrackingDataImpl()) },
+                new Object[] { "parcel", SetParcelTrackingDataChange.builder()
                         .parcel(new com.commercetools.history.models.change_value.ParcelChangeValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPermissionsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPermissionsChangeTest.java
index ba927855e56..6eb31216b45 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPermissionsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPermissionsChangeTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetPermissionsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetPermissionsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetPermissionsChangeBuilder builder) {
         SetPermissionsChange setPermissionsChange = builder.buildUnchecked();
         Assertions.assertThat(setPermissionsChange).isInstanceOf(SetPermissionsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetPermissionsChange.builder().change("change") },
-                new Object[] { SetPermissionsChange.builder()
-                        .previousValue(Collections.singletonList(
-                            com.commercetools.history.models.common.Permission.findEnum("AddChildUnits"))) },
-                new Object[] { SetPermissionsChange.builder()
-                        .nextValue(Collections.singletonList(
-                            com.commercetools.history.models.common.Permission.findEnum("AddChildUnits"))) } };
+        return new Object[][] { new Object[] { "change", SetPermissionsChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetPermissionsChange.builder()
+                                .previousValue(Collections.singletonList(
+                                    com.commercetools.history.models.common.Permission.findEnum("AddChildUnits"))) },
+                new Object[] { "nextValue",
+                        SetPermissionsChange.builder()
+                                .nextValue(Collections.singletonList(
+                                    com.commercetools.history.models.common.Permission.findEnum("AddChildUnits"))) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPricesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPricesChangeTest.java
index 2120fb7b1d4..afd2faf41c7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPricesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPricesChangeTest.java
@@ -3,40 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetPricesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetPricesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetPricesChangeBuilder builder) {
         SetPricesChange setPricesChange = builder.buildUnchecked();
         Assertions.assertThat(setPricesChange).isInstanceOf(SetPricesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetPricesChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", SetPricesChange.builder().change("change") },
+                new Object[] { "previousValue",
                         SetPricesChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.PriceImpl())) },
-                new Object[] {
+                new Object[] { "nextValue",
                         SetPricesChange.builder()
                                 .nextValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.PriceImpl())) },
-                new Object[] { SetPricesChange.builder().catalogData("catalogData") },
-                new Object[] { SetPricesChange.builder().variant("variant") } };
+                new Object[] { "catalogData", SetPricesChange.builder().catalogData("catalogData") },
+                new Object[] { "variant", SetPricesChange.builder().variant("variant") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductCountChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductCountChangeTest.java
index bc5cba4d194..b926bbecb61 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductCountChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductCountChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetProductCountChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetProductCountChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetProductCountChangeBuilder builder) {
         SetProductCountChange setProductCountChange = builder.buildUnchecked();
         Assertions.assertThat(setProductCountChange).isInstanceOf(SetProductCountChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetProductCountChange.builder().change("change") },
-                new Object[] { SetProductCountChange.builder().previousValue(8) },
-                new Object[] { SetProductCountChange.builder().nextValue(7) } };
+        return new Object[][] { new Object[] { "change", SetProductCountChange.builder().change("change") },
+                new Object[] { "previousValue", SetProductCountChange.builder().previousValue(8) },
+                new Object[] { "nextValue", SetProductCountChange.builder().nextValue(7) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductPriceCustomFieldChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductPriceCustomFieldChangeTest.java
index 53fbdf422e6..24a4e8082bc 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductPriceCustomFieldChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductPriceCustomFieldChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetProductPriceCustomFieldChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetProductPriceCustomFieldChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetProductPriceCustomFieldChangeBuilder builder) {
         SetProductPriceCustomFieldChange setProductPriceCustomFieldChange = builder.buildUnchecked();
         Assertions.assertThat(setProductPriceCustomFieldChange).isInstanceOf(SetProductPriceCustomFieldChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetProductPriceCustomFieldChange.builder().change("change") },
-                new Object[] { SetProductPriceCustomFieldChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetProductPriceCustomFieldChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetProductPriceCustomFieldChange.builder().catalogData("catalogData") } };
+        return new Object[][] { new Object[] { "change", SetProductPriceCustomFieldChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetProductPriceCustomFieldChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "nextValue",
+                        SetProductPriceCustomFieldChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "catalogData", SetProductPriceCustomFieldChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductPriceCustomTypeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductPriceCustomTypeChangeTest.java
index 1131a40ad41..92546961236 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductPriceCustomTypeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductPriceCustomTypeChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetProductPriceCustomTypeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetProductPriceCustomTypeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetProductPriceCustomTypeChangeBuilder builder) {
         SetProductPriceCustomTypeChange setProductPriceCustomTypeChange = builder.buildUnchecked();
         Assertions.assertThat(setProductPriceCustomTypeChange).isInstanceOf(SetProductPriceCustomTypeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetProductPriceCustomTypeChange.builder().change("change") },
-                new Object[] { SetProductPriceCustomTypeChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetProductPriceCustomTypeChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetProductPriceCustomTypeChange.builder().catalogData("catalogData") } };
+        return new Object[][] { new Object[] { "change", SetProductPriceCustomTypeChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetProductPriceCustomTypeChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "nextValue",
+                        SetProductPriceCustomTypeChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "catalogData", SetProductPriceCustomTypeChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductSelectionsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductSelectionsChangeTest.java
index 683aa2afad0..1f2aef4e919 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductSelectionsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductSelectionsChangeTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetProductSelectionsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetProductSelectionsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetProductSelectionsChangeBuilder builder) {
         SetProductSelectionsChange setProductSelectionsChange = builder.buildUnchecked();
         Assertions.assertThat(setProductSelectionsChange).isInstanceOf(SetProductSelectionsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetProductSelectionsChange.builder().change("change") },
-                new Object[] { SetProductSelectionsChange.builder()
-                        .previousValue(Collections.singletonList(
-                            new com.commercetools.history.models.common.ProductSelectionSettingImpl())) },
-                new Object[] { SetProductSelectionsChange.builder()
-                        .nextValue(Collections.singletonList(
-                            new com.commercetools.history.models.common.ProductSelectionSettingImpl())) } };
+        return new Object[][] { new Object[] { "change", SetProductSelectionsChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetProductSelectionsChange.builder()
+                                .previousValue(Collections.singletonList(
+                                    new com.commercetools.history.models.common.ProductSelectionSettingImpl())) },
+                new Object[] { "nextValue",
+                        SetProductSelectionsChange.builder()
+                                .nextValue(Collections.singletonList(
+                                    new com.commercetools.history.models.common.ProductSelectionSettingImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductVariantKeyChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductVariantKeyChangeTest.java
index 96be07df316..561c60bd07a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductVariantKeyChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetProductVariantKeyChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetProductVariantKeyChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetProductVariantKeyChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetProductVariantKeyChangeBuilder builder) {
         SetProductVariantKeyChange setProductVariantKeyChange = builder.buildUnchecked();
         Assertions.assertThat(setProductVariantKeyChange).isInstanceOf(SetProductVariantKeyChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetProductVariantKeyChange.builder().change("change") },
-                new Object[] { SetProductVariantKeyChange.builder().previousValue("previousValue") },
-                new Object[] { SetProductVariantKeyChange.builder().nextValue("nextValue") },
-                new Object[] { SetProductVariantKeyChange.builder().catalogData("catalogData") } };
+        return new Object[][] { new Object[] { "change", SetProductVariantKeyChange.builder().change("change") },
+                new Object[] { "previousValue", SetProductVariantKeyChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetProductVariantKeyChange.builder().nextValue("nextValue") },
+                new Object[] { "catalogData", SetProductVariantKeyChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPropertyChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPropertyChangeTest.java
index 1b4ec3014b7..69ff6aa5719 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPropertyChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPropertyChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetPropertyChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetPropertyChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetPropertyChangeBuilder builder) {
         SetPropertyChange setPropertyChange = builder.buildUnchecked();
         Assertions.assertThat(setPropertyChange).isInstanceOf(SetPropertyChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetPropertyChange.builder().change("change") },
-                new Object[] { SetPropertyChange.builder().previousValue("previousValue") },
-                new Object[] { SetPropertyChange.builder().nextValue("nextValue") },
-                new Object[] { SetPropertyChange.builder().path("path") } };
+        return new Object[][] { new Object[] { "change", SetPropertyChange.builder().change("change") },
+                new Object[] { "previousValue", SetPropertyChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetPropertyChange.builder().nextValue("nextValue") },
+                new Object[] { "path", SetPropertyChange.builder().path("path") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPurchaseOrderNumberChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPurchaseOrderNumberChangeTest.java
index bd01bf7b09f..2b02148b9ac 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPurchaseOrderNumberChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetPurchaseOrderNumberChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetPurchaseOrderNumberChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetPurchaseOrderNumberChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetPurchaseOrderNumberChangeBuilder builder) {
         SetPurchaseOrderNumberChange setPurchaseOrderNumberChange = builder.buildUnchecked();
         Assertions.assertThat(setPurchaseOrderNumberChange).isInstanceOf(SetPurchaseOrderNumberChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetPurchaseOrderNumberChange.builder().change("change") },
-                new Object[] { SetPurchaseOrderNumberChange.builder().previousValue("previousValue") },
-                new Object[] { SetPurchaseOrderNumberChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetPurchaseOrderNumberChange.builder().change("change") },
+                new Object[] { "previousValue", SetPurchaseOrderNumberChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetPurchaseOrderNumberChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetRatingChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetRatingChangeTest.java
index b26f295b45f..4686452ba0d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetRatingChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetRatingChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetRatingChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetRatingChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetRatingChangeBuilder builder) {
         SetRatingChange setRatingChange = builder.buildUnchecked();
         Assertions.assertThat(setRatingChange).isInstanceOf(SetRatingChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetRatingChange.builder().change("change") },
-                new Object[] { SetRatingChange.builder().previousValue(8) },
-                new Object[] { SetRatingChange.builder().nextValue(7) } };
+        return new Object[][] { new Object[] { "change", SetRatingChange.builder().change("change") },
+                new Object[] { "previousValue", SetRatingChange.builder().previousValue(8) },
+                new Object[] { "nextValue", SetRatingChange.builder().nextValue(7) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetReservationsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetReservationsChangeTest.java
index d838d27315e..13691aee367 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetReservationsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetReservationsChangeTest.java
@@ -3,37 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetReservationsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetReservationsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetReservationsChangeBuilder builder) {
         SetReservationsChange setReservationsChange = builder.buildUnchecked();
         Assertions.assertThat(setReservationsChange).isInstanceOf(SetReservationsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetReservationsChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", SetReservationsChange.builder().change("change") },
+                new Object[] { "previousValue",
                         SetReservationsChange.builder()
                                 .previousValue(Collections.singletonList(
                                     new com.commercetools.history.models.common.ReservationImpl())) },
-                new Object[] { SetReservationsChange.builder()
-                        .nextValue(Collections
-                                .singletonList(new com.commercetools.history.models.common.ReservationImpl())) } };
+                new Object[] { "nextValue",
+                        SetReservationsChange.builder()
+                                .nextValue(Collections.singletonList(
+                                    new com.commercetools.history.models.common.ReservationImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetRestockableInDaysChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetRestockableInDaysChangeTest.java
index 8c7cfc1709d..036edd88a9a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetRestockableInDaysChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetRestockableInDaysChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetRestockableInDaysChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetRestockableInDaysChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetRestockableInDaysChangeBuilder builder) {
         SetRestockableInDaysChange setRestockableInDaysChange = builder.buildUnchecked();
         Assertions.assertThat(setRestockableInDaysChange).isInstanceOf(SetRestockableInDaysChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetRestockableInDaysChange.builder().change("change") },
-                new Object[] { SetRestockableInDaysChange.builder().previousValue(8) },
-                new Object[] { SetRestockableInDaysChange.builder().nextValue(7) } };
+        return new Object[][] { new Object[] { "change", SetRestockableInDaysChange.builder().change("change") },
+                new Object[] { "previousValue", SetRestockableInDaysChange.builder().previousValue(8) },
+                new Object[] { "nextValue", SetRestockableInDaysChange.builder().nextValue(7) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetReturnPaymentStateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetReturnPaymentStateChangeTest.java
index 0d42824c420..52535fdf518 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetReturnPaymentStateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetReturnPaymentStateChangeTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetReturnPaymentStateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetReturnPaymentStateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetReturnPaymentStateChangeBuilder builder) {
         SetReturnPaymentStateChange setReturnPaymentStateChange = builder.buildUnchecked();
         Assertions.assertThat(setReturnPaymentStateChange).isInstanceOf(SetReturnPaymentStateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetReturnPaymentStateChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", SetReturnPaymentStateChange.builder().change("change") },
+                new Object[] { "previousValue",
                         SetReturnPaymentStateChange.builder()
                                 .previousValue(com.commercetools.history.models.common.ReturnPaymentState
                                         .findEnum("NonRefundable")) },
-                new Object[] { SetReturnPaymentStateChange.builder()
+                new Object[] { "nextValue", SetReturnPaymentStateChange.builder()
                         .nextValue(
                             com.commercetools.history.models.common.ReturnPaymentState.findEnum("NonRefundable")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetReturnShipmentStateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetReturnShipmentStateChangeTest.java
index 5e87b188e90..1173c9f56d4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetReturnShipmentStateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetReturnShipmentStateChangeTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetReturnShipmentStateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetReturnShipmentStateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetReturnShipmentStateChangeBuilder builder) {
         SetReturnShipmentStateChange setReturnShipmentStateChange = builder.buildUnchecked();
         Assertions.assertThat(setReturnShipmentStateChange).isInstanceOf(SetReturnShipmentStateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetReturnShipmentStateChange.builder().change("change") },
-                new Object[] { SetReturnShipmentStateChange.builder()
-                        .previousValue(
-                            com.commercetools.history.models.common.ReturnShipmentState.findEnum("Advised")) },
-                new Object[] { SetReturnShipmentStateChange.builder()
+        return new Object[][] { new Object[] { "change", SetReturnShipmentStateChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetReturnShipmentStateChange.builder()
+                                .previousValue(
+                                    com.commercetools.history.models.common.ReturnShipmentState.findEnum("Advised")) },
+                new Object[] { "nextValue", SetReturnShipmentStateChange.builder()
                         .nextValue(com.commercetools.history.models.common.ReturnShipmentState.findEnum("Advised")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSalutationChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSalutationChangeTest.java
index b379f632ab4..f4d5d6e24b3 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSalutationChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSalutationChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetSalutationChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetSalutationChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetSalutationChangeBuilder builder) {
         SetSalutationChange setSalutationChange = builder.buildUnchecked();
         Assertions.assertThat(setSalutationChange).isInstanceOf(SetSalutationChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetSalutationChange.builder().change("change") },
-                new Object[] { SetSalutationChange.builder().previousValue("previousValue") },
-                new Object[] { SetSalutationChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetSalutationChange.builder().change("change") },
+                new Object[] { "previousValue", SetSalutationChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetSalutationChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSearchKeywordsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSearchKeywordsChangeTest.java
index 097b522c1ae..b62baa6e5cb 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSearchKeywordsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSearchKeywordsChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetSearchKeywordsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetSearchKeywordsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetSearchKeywordsChangeBuilder builder) {
         SetSearchKeywordsChange setSearchKeywordsChange = builder.buildUnchecked();
         Assertions.assertThat(setSearchKeywordsChange).isInstanceOf(SetSearchKeywordsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetSearchKeywordsChange.builder().change("change") },
-                new Object[] { SetSearchKeywordsChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.SearchKeywordsImpl()) },
-                new Object[] { SetSearchKeywordsChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.SearchKeywordsImpl()) },
-                new Object[] { SetSearchKeywordsChange.builder().catalogData("catalogData") } };
+        return new Object[][] { new Object[] { "change", SetSearchKeywordsChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetSearchKeywordsChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.SearchKeywordsImpl()) },
+                new Object[] { "nextValue",
+                        SetSearchKeywordsChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.SearchKeywordsImpl()) },
+                new Object[] { "catalogData", SetSearchKeywordsChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSellerCommentChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSellerCommentChangeTest.java
index b846f513e9b..3a0868976fb 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSellerCommentChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSellerCommentChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetSellerCommentChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetSellerCommentChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetSellerCommentChangeBuilder builder) {
         SetSellerCommentChange setSellerCommentChange = builder.buildUnchecked();
         Assertions.assertThat(setSellerCommentChange).isInstanceOf(SetSellerCommentChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetSellerCommentChange.builder().change("change") },
-                new Object[] { SetSellerCommentChange.builder().previousValue("previousValue") },
-                new Object[] { SetSellerCommentChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetSellerCommentChange.builder().change("change") },
+                new Object[] { "previousValue", SetSellerCommentChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetSellerCommentChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingAddressChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingAddressChangeTest.java
index 513121fa3b4..149068ad763 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingAddressChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingAddressChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetShippingAddressChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetShippingAddressChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetShippingAddressChangeBuilder builder) {
         SetShippingAddressChange setShippingAddressChange = builder.buildUnchecked();
         Assertions.assertThat(setShippingAddressChange).isInstanceOf(SetShippingAddressChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetShippingAddressChange.builder().change("change") },
-                new Object[] { SetShippingAddressChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { SetShippingAddressChange.builder()
+        return new Object[][] { new Object[] { "change", SetShippingAddressChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetShippingAddressChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "nextValue", SetShippingAddressChange.builder()
                         .nextValue(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingInfoPriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingInfoPriceChangeTest.java
index d9cc2c6b385..a12c69f819a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingInfoPriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingInfoPriceChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetShippingInfoPriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetShippingInfoPriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetShippingInfoPriceChangeBuilder builder) {
         SetShippingInfoPriceChange setShippingInfoPriceChange = builder.buildUnchecked();
         Assertions.assertThat(setShippingInfoPriceChange).isInstanceOf(SetShippingInfoPriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetShippingInfoPriceChange.builder().change("change") },
-                new Object[] { SetShippingInfoPriceChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetShippingInfoPriceChange.builder()
+        return new Object[][] { new Object[] { "change", SetShippingInfoPriceChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetShippingInfoPriceChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "nextValue", SetShippingInfoPriceChange.builder()
                         .nextValue(new com.commercetools.history.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingInfoTaxedPriceChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingInfoTaxedPriceChangeTest.java
index c0026c949ed..3cc818fa4e7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingInfoTaxedPriceChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingInfoTaxedPriceChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetShippingInfoTaxedPriceChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetShippingInfoTaxedPriceChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetShippingInfoTaxedPriceChangeBuilder builder) {
         SetShippingInfoTaxedPriceChange setShippingInfoTaxedPriceChange = builder.buildUnchecked();
         Assertions.assertThat(setShippingInfoTaxedPriceChange).isInstanceOf(SetShippingInfoTaxedPriceChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetShippingInfoTaxedPriceChange.builder().change("change") },
-                new Object[] { SetShippingInfoTaxedPriceChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.TaxedPriceImpl()) },
-                new Object[] { SetShippingInfoTaxedPriceChange.builder()
+        return new Object[][] { new Object[] { "change", SetShippingInfoTaxedPriceChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetShippingInfoTaxedPriceChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.TaxedPriceImpl()) },
+                new Object[] { "nextValue", SetShippingInfoTaxedPriceChange.builder()
                         .nextValue(new com.commercetools.history.models.common.TaxedPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingMethodChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingMethodChangeTest.java
index 0827ab4cc82..a0f42bec29a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingMethodChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingMethodChangeTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetShippingMethodChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetShippingMethodChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetShippingMethodChangeBuilder builder) {
         SetShippingMethodChange setShippingMethodChange = builder.buildUnchecked();
         Assertions.assertThat(setShippingMethodChange).isInstanceOf(SetShippingMethodChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetShippingMethodChange.builder().change("change") },
-                new Object[] { SetShippingMethodChange.builder()
+        return new Object[][] { new Object[] { "change", SetShippingMethodChange.builder().change("change") },
+                new Object[] { "previousValue", SetShippingMethodChange.builder()
                         .previousValue(
                             new com.commercetools.history.models.change_value.ShippingMethodChangeValueImpl()) },
-                new Object[] { SetShippingMethodChange.builder()
+                new Object[] { "nextValue", SetShippingMethodChange.builder()
                         .nextValue(
                             new com.commercetools.history.models.change_value.ShippingMethodChangeValueImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingMethodTaxAmountChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingMethodTaxAmountChangeTest.java
index 8d0aec9af18..13e7c353e4f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingMethodTaxAmountChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingMethodTaxAmountChangeTest.java
@@ -1,37 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetShippingMethodTaxAmountChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetShippingMethodTaxAmountChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetShippingMethodTaxAmountChangeBuilder builder) {
         SetShippingMethodTaxAmountChange setShippingMethodTaxAmountChange = builder.buildUnchecked();
         Assertions.assertThat(setShippingMethodTaxAmountChange).isInstanceOf(SetShippingMethodTaxAmountChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetShippingMethodTaxAmountChange.builder().change("change") },
-                new Object[] { SetShippingMethodTaxAmountChange.builder()
+        return new Object[][] { new Object[] { "change", SetShippingMethodTaxAmountChange.builder().change("change") },
+                new Object[] { "previousValue", SetShippingMethodTaxAmountChange.builder()
                         .previousValue(
                             new com.commercetools.history.models.change_value.ShippingMethodTaxAmountChangeValueImpl()) },
-                new Object[] { SetShippingMethodTaxAmountChange.builder()
+                new Object[] { "nextValue", SetShippingMethodTaxAmountChange.builder()
                         .nextValue(
                             new com.commercetools.history.models.change_value.ShippingMethodTaxAmountChangeValueImpl()) },
-                new Object[] { SetShippingMethodTaxAmountChange.builder()
+                new Object[] { "taxMode", SetShippingMethodTaxAmountChange.builder()
                         .taxMode(com.commercetools.history.models.common.TaxMode.findEnum("Platform")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingMethodTaxRateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingMethodTaxRateChangeTest.java
index a923138eb9a..a410d4cebca 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingMethodTaxRateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingMethodTaxRateChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetShippingMethodTaxRateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetShippingMethodTaxRateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetShippingMethodTaxRateChangeBuilder builder) {
         SetShippingMethodTaxRateChange setShippingMethodTaxRateChange = builder.buildUnchecked();
         Assertions.assertThat(setShippingMethodTaxRateChange).isInstanceOf(SetShippingMethodTaxRateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetShippingMethodTaxRateChange.builder().change("change") },
-                new Object[] { SetShippingMethodTaxRateChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) },
-                new Object[] { SetShippingMethodTaxRateChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.TaxRateImpl()) },
-                new Object[] { SetShippingMethodTaxRateChange.builder()
+        return new Object[][] { new Object[] { "change", SetShippingMethodTaxRateChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetShippingMethodTaxRateChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) },
+                new Object[] { "nextValue",
+                        SetShippingMethodTaxRateChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.TaxRateImpl()) },
+                new Object[] { "taxMode", SetShippingMethodTaxRateChange.builder()
                         .taxMode(com.commercetools.history.models.common.TaxMode.findEnum("Platform")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingRateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingRateChangeTest.java
index e349ecfc48c..cd1df8b1c31 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingRateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingRateChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetShippingRateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetShippingRateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetShippingRateChangeBuilder builder) {
         SetShippingRateChange setShippingRateChange = builder.buildUnchecked();
         Assertions.assertThat(setShippingRateChange).isInstanceOf(SetShippingRateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetShippingRateChange.builder().change("change") },
-                new Object[] { SetShippingRateChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { SetShippingRateChange.builder()
+        return new Object[][] { new Object[] { "change", SetShippingRateChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetShippingRateChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "nextValue", SetShippingRateChange.builder()
                         .nextValue(new com.commercetools.history.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingRateInputChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingRateInputChangeTest.java
index b612deafba7..8a65038a473 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingRateInputChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShippingRateInputChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetShippingRateInputChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetShippingRateInputChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetShippingRateInputChangeBuilder builder) {
         SetShippingRateInputChange setShippingRateInputChange = builder.buildUnchecked();
         Assertions.assertThat(setShippingRateInputChange).isInstanceOf(SetShippingRateInputChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetShippingRateInputChange.builder().change("change") },
-                new Object[] { SetShippingRateInputChange.builder().previousValue("previousValue") },
-                new Object[] { SetShippingRateInputChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetShippingRateInputChange.builder().change("change") },
+                new Object[] { "previousValue", SetShippingRateInputChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetShippingRateInputChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShoppingListLineItemCustomFieldChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShoppingListLineItemCustomFieldChangeTest.java
index 2598776790f..db704d1ad79 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShoppingListLineItemCustomFieldChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShoppingListLineItemCustomFieldChangeTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetShoppingListLineItemCustomFieldChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetShoppingListLineItemCustomFieldChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetShoppingListLineItemCustomFieldChangeBuilder builder) {
         SetShoppingListLineItemCustomFieldChange setShoppingListLineItemCustomFieldChange = builder.buildUnchecked();
         Assertions.assertThat(setShoppingListLineItemCustomFieldChange)
                 .isInstanceOf(SetShoppingListLineItemCustomFieldChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetShoppingListLineItemCustomFieldChange.builder().change("change") },
-                new Object[] { SetShoppingListLineItemCustomFieldChange.builder().previousValue("previousValue") },
-                new Object[] { SetShoppingListLineItemCustomFieldChange.builder().nextValue("nextValue") },
-                new Object[] { SetShoppingListLineItemCustomFieldChange.builder().name("name") },
-                new Object[] { SetShoppingListLineItemCustomFieldChange.builder().customTypeId("customTypeId") },
-                new Object[] { SetShoppingListLineItemCustomFieldChange.builder()
+        return new Object[][] {
+                new Object[] { "change", SetShoppingListLineItemCustomFieldChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetShoppingListLineItemCustomFieldChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetShoppingListLineItemCustomFieldChange.builder().nextValue("nextValue") },
+                new Object[] { "name", SetShoppingListLineItemCustomFieldChange.builder().name("name") },
+                new Object[] { "customTypeId",
+                        SetShoppingListLineItemCustomFieldChange.builder().customTypeId("customTypeId") },
+                new Object[] { "lineItem", SetShoppingListLineItemCustomFieldChange.builder()
                         .lineItem(
                             new com.commercetools.history.models.change_value.ShoppingListLineItemValueImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShoppingListLineItemCustomTypeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShoppingListLineItemCustomTypeChangeTest.java
index 5813253b3cd..058f2e698d6 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShoppingListLineItemCustomTypeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetShoppingListLineItemCustomTypeChangeTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetShoppingListLineItemCustomTypeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetShoppingListLineItemCustomTypeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetShoppingListLineItemCustomTypeChangeBuilder builder) {
         SetShoppingListLineItemCustomTypeChange setShoppingListLineItemCustomTypeChange = builder.buildUnchecked();
         Assertions.assertThat(setShoppingListLineItemCustomTypeChange)
                 .isInstanceOf(SetShoppingListLineItemCustomTypeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetShoppingListLineItemCustomTypeChange.builder().change("change") },
-                new Object[] { SetShoppingListLineItemCustomTypeChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetShoppingListLineItemCustomTypeChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetShoppingListLineItemCustomTypeChange.builder()
+        return new Object[][] {
+                new Object[] { "change", SetShoppingListLineItemCustomTypeChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetShoppingListLineItemCustomTypeChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "nextValue",
+                        SetShoppingListLineItemCustomTypeChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "lineItem", SetShoppingListLineItemCustomTypeChange.builder()
                         .lineItem(
                             new com.commercetools.history.models.change_value.ShoppingListLineItemValueImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSkuChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSkuChangeTest.java
index 723cb9c3215..881147f0799 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSkuChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSkuChangeTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetSkuChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetSkuChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetSkuChangeBuilder builder) {
         SetSkuChange setSkuChange = builder.buildUnchecked();
         Assertions.assertThat(setSkuChange).isInstanceOf(SetSkuChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetSkuChange.builder().change("change") },
-                new Object[] { SetSkuChange.builder().previousValue("previousValue") },
-                new Object[] { SetSkuChange.builder().nextValue("nextValue") },
-                new Object[] { SetSkuChange.builder().catalogData("catalogData") } };
+        return new Object[][] { new Object[] { "change", SetSkuChange.builder().change("change") },
+                new Object[] { "previousValue", SetSkuChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetSkuChange.builder().nextValue("nextValue") },
+                new Object[] { "catalogData", SetSkuChange.builder().catalogData("catalogData") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSlugChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSlugChangeTest.java
index 6f100ad0117..43988ca5b48 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSlugChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSlugChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetSlugChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetSlugChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetSlugChangeBuilder builder) {
         SetSlugChange setSlugChange = builder.buildUnchecked();
         Assertions.assertThat(setSlugChange).isInstanceOf(SetSlugChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetSlugChange.builder().change("change") },
-                new Object[] { SetSlugChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetSlugChange.builder()
+        return new Object[][] { new Object[] { "change", SetSlugChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetSlugChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue", SetSlugChange.builder()
                         .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStateRolesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStateRolesChangeTest.java
index d70e7cdcb43..a95593dc2e9 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStateRolesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStateRolesChangeTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetStateRolesChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetStateRolesChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetStateRolesChangeBuilder builder) {
         SetStateRolesChange setStateRolesChange = builder.buildUnchecked();
         Assertions.assertThat(setStateRolesChange).isInstanceOf(SetStateRolesChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetStateRolesChange.builder().change("change") },
-                new Object[] { SetStateRolesChange.builder()
+        return new Object[][] { new Object[] { "change", SetStateRolesChange.builder().change("change") },
+                new Object[] { "previousValue", SetStateRolesChange.builder()
                         .previousValue(Collections.singletonList(com.commercetools.history.models.common.StateRoleEnum
                                 .findEnum("ReviewIncludedInStatistics"))) },
-                new Object[] { SetStateRolesChange.builder()
+                new Object[] { "nextValue", SetStateRolesChange.builder()
                         .nextValue(Collections.singletonList(com.commercetools.history.models.common.StateRoleEnum
                                 .findEnum("ReviewIncludedInStatistics"))) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStatusInterfaceCodeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStatusInterfaceCodeChangeTest.java
index ac7ce2a409e..e0462108c7c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStatusInterfaceCodeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStatusInterfaceCodeChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetStatusInterfaceCodeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetStatusInterfaceCodeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetStatusInterfaceCodeChangeBuilder builder) {
         SetStatusInterfaceCodeChange setStatusInterfaceCodeChange = builder.buildUnchecked();
         Assertions.assertThat(setStatusInterfaceCodeChange).isInstanceOf(SetStatusInterfaceCodeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetStatusInterfaceCodeChange.builder().change("change") },
-                new Object[] { SetStatusInterfaceCodeChange.builder().previousValue("previousValue") },
-                new Object[] { SetStatusInterfaceCodeChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetStatusInterfaceCodeChange.builder().change("change") },
+                new Object[] { "previousValue", SetStatusInterfaceCodeChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetStatusInterfaceCodeChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStatusInterfaceTextChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStatusInterfaceTextChangeTest.java
index 6ae45655018..af905cc14a4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStatusInterfaceTextChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStatusInterfaceTextChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetStatusInterfaceTextChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetStatusInterfaceTextChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetStatusInterfaceTextChangeBuilder builder) {
         SetStatusInterfaceTextChange setStatusInterfaceTextChange = builder.buildUnchecked();
         Assertions.assertThat(setStatusInterfaceTextChange).isInstanceOf(SetStatusInterfaceTextChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetStatusInterfaceTextChange.builder().change("change") },
-                new Object[] { SetStatusInterfaceTextChange.builder().previousValue("previousValue") },
-                new Object[] { SetStatusInterfaceTextChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetStatusInterfaceTextChange.builder().change("change") },
+                new Object[] { "previousValue", SetStatusInterfaceTextChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetStatusInterfaceTextChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStoreChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStoreChangeTest.java
index bb36a4ab999..ab63a239057 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStoreChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStoreChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetStoreChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetStoreChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetStoreChangeBuilder builder) {
         SetStoreChange setStoreChange = builder.buildUnchecked();
         Assertions.assertThat(setStoreChange).isInstanceOf(SetStoreChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetStoreChange.builder().change("change") },
-                new Object[] { SetStoreChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { SetStoreChange.builder()
+        return new Object[][] { new Object[] { "change", SetStoreChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetStoreChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "nextValue", SetStoreChange.builder()
                         .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStoreModeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStoreModeChangeTest.java
index 29243eeb829..a264b3bf1c7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStoreModeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStoreModeChangeTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetStoreModeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetStoreModeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetStoreModeChangeBuilder builder) {
         SetStoreModeChange setStoreModeChange = builder.buildUnchecked();
         Assertions.assertThat(setStoreModeChange).isInstanceOf(SetStoreModeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetStoreModeChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", SetStoreModeChange.builder().change("change") },
+                new Object[] { "previousValue",
                         SetStoreModeChange.builder()
                                 .previousValue(com.commercetools.history.models.common.BusinessUnitStoreMode
                                         .findEnum("Explicit")) },
-                new Object[] { SetStoreModeChange.builder()
+                new Object[] { "nextValue", SetStoreModeChange.builder()
                         .nextValue(
                             com.commercetools.history.models.common.BusinessUnitStoreMode.findEnum("Explicit")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStoresChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStoresChangeTest.java
index 8190d316112..9a253b43775 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStoresChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStoresChangeTest.java
@@ -3,35 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetStoresChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetStoresChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetStoresChangeBuilder builder) {
         SetStoresChange setStoresChange = builder.buildUnchecked();
         Assertions.assertThat(setStoresChange).isInstanceOf(SetStoresChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetStoresChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", SetStoresChange.builder().change("change") },
+                new Object[] { "previousValue",
                         SetStoresChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ReferenceImpl())) },
-                new Object[] { SetStoresChange.builder()
+                new Object[] { "nextValue", SetStoresChange.builder()
                         .nextValue(
                             Collections.singletonList(new com.commercetools.history.models.common.ReferenceImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSupplyChannelChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSupplyChannelChangeTest.java
index bc7511fc9e4..4cb1b477721 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSupplyChannelChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSupplyChannelChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetSupplyChannelChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetSupplyChannelChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetSupplyChannelChangeBuilder builder) {
         SetSupplyChannelChange setSupplyChannelChange = builder.buildUnchecked();
         Assertions.assertThat(setSupplyChannelChange).isInstanceOf(SetSupplyChannelChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetSupplyChannelChange.builder().change("change") },
-                new Object[] { SetSupplyChannelChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { SetSupplyChannelChange.builder()
+        return new Object[][] { new Object[] { "change", SetSupplyChannelChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetSupplyChannelChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "nextValue", SetSupplyChannelChange.builder()
                         .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSupplyChannelsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSupplyChannelsChangeTest.java
index d5b8f37d03b..d48a4e0fc98 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSupplyChannelsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetSupplyChannelsChangeTest.java
@@ -3,35 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetSupplyChannelsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetSupplyChannelsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetSupplyChannelsChangeBuilder builder) {
         SetSupplyChannelsChange setSupplyChannelsChange = builder.buildUnchecked();
         Assertions.assertThat(setSupplyChannelsChange).isInstanceOf(SetSupplyChannelsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetSupplyChannelsChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", SetSupplyChannelsChange.builder().change("change") },
+                new Object[] { "previousValue",
                         SetSupplyChannelsChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ReferenceImpl())) },
-                new Object[] { SetSupplyChannelsChange.builder()
+                new Object[] { "nextValue", SetSupplyChannelsChange.builder()
                         .nextValue(
                             Collections.singletonList(new com.commercetools.history.models.common.ReferenceImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTargetChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTargetChangeTest.java
index 679f26f9611..1bed99082fa 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTargetChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTargetChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetTargetChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetTargetChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetTargetChangeBuilder builder) {
         SetTargetChange setTargetChange = builder.buildUnchecked();
         Assertions.assertThat(setTargetChange).isInstanceOf(SetTargetChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetTargetChange.builder().change("change") },
-                new Object[] { SetTargetChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { SetTargetChange.builder()
+        return new Object[][] { new Object[] { "change", SetTargetChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetTargetChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "nextValue", SetTargetChange.builder()
                         .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTaxCategoryChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTaxCategoryChangeTest.java
index 91e9dda95b5..7a7b6c13ac0 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTaxCategoryChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTaxCategoryChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetTaxCategoryChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetTaxCategoryChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetTaxCategoryChangeBuilder builder) {
         SetTaxCategoryChange setTaxCategoryChange = builder.buildUnchecked();
         Assertions.assertThat(setTaxCategoryChange).isInstanceOf(SetTaxCategoryChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetTaxCategoryChange.builder().change("change") },
-                new Object[] { SetTaxCategoryChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { SetTaxCategoryChange.builder()
+        return new Object[][] { new Object[] { "change", SetTaxCategoryChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetTaxCategoryChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "nextValue", SetTaxCategoryChange.builder()
                         .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextChangeTest.java
index fae254aba2b..5eea4bca762 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetTextChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetTextChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetTextChangeBuilder builder) {
         SetTextChange setTextChange = builder.buildUnchecked();
         Assertions.assertThat(setTextChange).isInstanceOf(SetTextChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetTextChange.builder().change("change") },
-                new Object[] { SetTextChange.builder().previousValue("previousValue") },
-                new Object[] { SetTextChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetTextChange.builder().change("change") },
+                new Object[] { "previousValue", SetTextChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetTextChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextLineItemCustomFieldChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextLineItemCustomFieldChangeTest.java
index 0038f95a533..8472cdd5a8e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextLineItemCustomFieldChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextLineItemCustomFieldChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetTextLineItemCustomFieldChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetTextLineItemCustomFieldChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetTextLineItemCustomFieldChangeBuilder builder) {
         SetTextLineItemCustomFieldChange setTextLineItemCustomFieldChange = builder.buildUnchecked();
         Assertions.assertThat(setTextLineItemCustomFieldChange).isInstanceOf(SetTextLineItemCustomFieldChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetTextLineItemCustomFieldChange.builder().change("change") },
-                new Object[] { SetTextLineItemCustomFieldChange.builder().previousValue("previousValue") },
-                new Object[] { SetTextLineItemCustomFieldChange.builder().nextValue("nextValue") },
-                new Object[] { SetTextLineItemCustomFieldChange.builder().name("name") },
-                new Object[] { SetTextLineItemCustomFieldChange.builder().customTypeId("customTypeId") },
-                new Object[] { SetTextLineItemCustomFieldChange.builder()
+        return new Object[][] { new Object[] { "change", SetTextLineItemCustomFieldChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetTextLineItemCustomFieldChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetTextLineItemCustomFieldChange.builder().nextValue("nextValue") },
+                new Object[] { "name", SetTextLineItemCustomFieldChange.builder().name("name") },
+                new Object[] { "customTypeId",
+                        SetTextLineItemCustomFieldChange.builder().customTypeId("customTypeId") },
+                new Object[] { "textLineItem", SetTextLineItemCustomFieldChange.builder()
                         .textLineItem(new com.commercetools.history.models.change_value.TextLineItemValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextLineItemCustomTypeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextLineItemCustomTypeChangeTest.java
index 852d280fdb6..13b1a5c65f8 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextLineItemCustomTypeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextLineItemCustomTypeChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetTextLineItemCustomTypeChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetTextLineItemCustomTypeChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetTextLineItemCustomTypeChangeBuilder builder) {
         SetTextLineItemCustomTypeChange setTextLineItemCustomTypeChange = builder.buildUnchecked();
         Assertions.assertThat(setTextLineItemCustomTypeChange).isInstanceOf(SetTextLineItemCustomTypeChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetTextLineItemCustomTypeChange.builder().change("change") },
-                new Object[] { SetTextLineItemCustomTypeChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetTextLineItemCustomTypeChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { SetTextLineItemCustomTypeChange.builder()
+        return new Object[][] { new Object[] { "change", SetTextLineItemCustomTypeChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetTextLineItemCustomTypeChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "nextValue",
+                        SetTextLineItemCustomTypeChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "textLineItem", SetTextLineItemCustomTypeChange.builder()
                         .textLineItem(new com.commercetools.history.models.change_value.TextLineItemValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextLineItemDescriptionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextLineItemDescriptionChangeTest.java
index aeccc203f7c..9bc208c0f08 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextLineItemDescriptionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTextLineItemDescriptionChangeTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetTextLineItemDescriptionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetTextLineItemDescriptionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetTextLineItemDescriptionChangeBuilder builder) {
         SetTextLineItemDescriptionChange setTextLineItemDescriptionChange = builder.buildUnchecked();
         Assertions.assertThat(setTextLineItemDescriptionChange).isInstanceOf(SetTextLineItemDescriptionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetTextLineItemDescriptionChange.builder().change("change") },
-                new Object[] { SetTextLineItemDescriptionChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetTextLineItemDescriptionChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { SetTextLineItemDescriptionChange.builder()
+        return new Object[][] { new Object[] { "change", SetTextLineItemDescriptionChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetTextLineItemDescriptionChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "nextValue",
+                        SetTextLineItemDescriptionChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "textLineItem", SetTextLineItemDescriptionChange.builder()
                         .textLineItem(new com.commercetools.history.models.change_value.TextLineItemValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTitleChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTitleChangeTest.java
index f5b12c82268..f5d89eabcef 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTitleChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTitleChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetTitleChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetTitleChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetTitleChangeBuilder builder) {
         SetTitleChange setTitleChange = builder.buildUnchecked();
         Assertions.assertThat(setTitleChange).isInstanceOf(SetTitleChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetTitleChange.builder().change("change") },
-                new Object[] { SetTitleChange.builder().previousValue("previousValue") },
-                new Object[] { SetTitleChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetTitleChange.builder().change("change") },
+                new Object[] { "previousValue", SetTitleChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetTitleChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTransitionsChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTransitionsChangeTest.java
index 651f06f0f4a..4ef89927459 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTransitionsChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetTransitionsChangeTest.java
@@ -3,35 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetTransitionsChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetTransitionsChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetTransitionsChangeBuilder builder) {
         SetTransitionsChange setTransitionsChange = builder.buildUnchecked();
         Assertions.assertThat(setTransitionsChange).isInstanceOf(SetTransitionsChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetTransitionsChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", SetTransitionsChange.builder().change("change") },
+                new Object[] { "previousValue",
                         SetTransitionsChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ReferenceImpl())) },
-                new Object[] { SetTransitionsChange.builder()
+                new Object[] { "nextValue", SetTransitionsChange.builder()
                         .nextValue(
                             Collections.singletonList(new com.commercetools.history.models.common.ReferenceImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidFromAndUntilChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidFromAndUntilChangeTest.java
index 18e512c0bc6..3926e8fed9f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidFromAndUntilChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidFromAndUntilChangeTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetValidFromAndUntilChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetValidFromAndUntilChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetValidFromAndUntilChangeBuilder builder) {
         SetValidFromAndUntilChange setValidFromAndUntilChange = builder.buildUnchecked();
         Assertions.assertThat(setValidFromAndUntilChange).isInstanceOf(SetValidFromAndUntilChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetValidFromAndUntilChange.builder().change("change") },
-                new Object[] { SetValidFromAndUntilChange.builder()
-                        .previousValue(
-                            new com.commercetools.history.models.change_value.ValidFromAndUntilValueImpl()) },
-                new Object[] { SetValidFromAndUntilChange.builder()
+        return new Object[][] { new Object[] { "change", SetValidFromAndUntilChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        SetValidFromAndUntilChange.builder()
+                                .previousValue(
+                                    new com.commercetools.history.models.change_value.ValidFromAndUntilValueImpl()) },
+                new Object[] { "nextValue", SetValidFromAndUntilChange.builder()
                         .nextValue(new com.commercetools.history.models.change_value.ValidFromAndUntilValueImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidFromChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidFromChangeTest.java
index 35aa2b1f5e8..f6599bc4c2d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidFromChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidFromChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetValidFromChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetValidFromChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetValidFromChangeBuilder builder) {
         SetValidFromChange setValidFromChange = builder.buildUnchecked();
         Assertions.assertThat(setValidFromChange).isInstanceOf(SetValidFromChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetValidFromChange.builder().change("change") },
-                new Object[] { SetValidFromChange.builder().previousValue("previousValue") },
-                new Object[] { SetValidFromChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetValidFromChange.builder().change("change") },
+                new Object[] { "previousValue", SetValidFromChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetValidFromChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidToChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidToChangeTest.java
index 697d1209837..7a48b4608a3 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidToChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidToChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetValidToChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetValidToChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetValidToChangeBuilder builder) {
         SetValidToChange setValidToChange = builder.buildUnchecked();
         Assertions.assertThat(setValidToChange).isInstanceOf(SetValidToChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetValidToChange.builder().change("change") },
-                new Object[] { SetValidToChange.builder().previousValue("previousValue") },
-                new Object[] { SetValidToChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetValidToChange.builder().change("change") },
+                new Object[] { "previousValue", SetValidToChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetValidToChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidUntilChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidUntilChangeTest.java
index 9cfe5041f3f..b781e23ce18 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidUntilChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValidUntilChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetValidUntilChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetValidUntilChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetValidUntilChangeBuilder builder) {
         SetValidUntilChange setValidUntilChange = builder.buildUnchecked();
         Assertions.assertThat(setValidUntilChange).isInstanceOf(SetValidUntilChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetValidUntilChange.builder().change("change") },
-                new Object[] { SetValidUntilChange.builder().previousValue("previousValue") },
-                new Object[] { SetValidUntilChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetValidUntilChange.builder().change("change") },
+                new Object[] { "previousValue", SetValidUntilChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetValidUntilChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValueChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValueChangeTest.java
index a1a036987d9..3fafeb5a0c3 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValueChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetValueChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetValueChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetValueChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetValueChangeBuilder builder) {
         SetValueChange setValueChange = builder.buildUnchecked();
         Assertions.assertThat(setValueChange).isInstanceOf(SetValueChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetValueChange.builder().change("change") },
-                new Object[] { SetValueChange.builder().previousValue("previousValue") },
-                new Object[] { SetValueChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetValueChange.builder().change("change") },
+                new Object[] { "previousValue", SetValueChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetValueChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetVariantAvailabilityChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetVariantAvailabilityChangeTest.java
index 1ba0fd5fce7..008ff288529 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetVariantAvailabilityChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetVariantAvailabilityChangeTest.java
@@ -1,36 +1,28 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetVariantAvailabilityChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetVariantAvailabilityChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetVariantAvailabilityChangeBuilder builder) {
         SetVariantAvailabilityChange setVariantAvailabilityChange = builder.buildUnchecked();
         Assertions.assertThat(setVariantAvailabilityChange).isInstanceOf(SetVariantAvailabilityChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetVariantAvailabilityChange.builder().change("change") },
-                new Object[] { SetVariantAvailabilityChange.builder()
+        return new Object[][] { new Object[] { "change", SetVariantAvailabilityChange.builder().change("change") },
+                new Object[] { "previousValue", SetVariantAvailabilityChange.builder()
                         .previousValue(new com.commercetools.history.models.common.ProductVariantAvailabilityImpl()) },
-                new Object[] { SetVariantAvailabilityChange.builder()
+                new Object[] { "nextValue", SetVariantAvailabilityChange.builder()
                         .nextValue(new com.commercetools.history.models.common.ProductVariantAvailabilityImpl()) },
-                new Object[] { SetVariantAvailabilityChange.builder().catalogData("catalogData") },
-                new Object[] { SetVariantAvailabilityChange.builder().variant("variant") } };
+                new Object[] { "catalogData", SetVariantAvailabilityChange.builder().catalogData("catalogData") },
+                new Object[] { "variant", SetVariantAvailabilityChange.builder().variant("variant") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetVariantSelectionChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetVariantSelectionChangeTest.java
index f94c1440880..9a0ce4fa973 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetVariantSelectionChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetVariantSelectionChangeTest.java
@@ -1,35 +1,28 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetVariantSelectionChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetVariantSelectionChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetVariantSelectionChangeBuilder builder) {
         SetVariantSelectionChange setVariantSelectionChange = builder.buildUnchecked();
         Assertions.assertThat(setVariantSelectionChange).isInstanceOf(SetVariantSelectionChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetVariantSelectionChange.builder().change("change") },
-                new Object[] { SetVariantSelectionChange.builder()
+        return new Object[][] { new Object[] { "change", SetVariantSelectionChange.builder().change("change") },
+                new Object[] { "previousValue", SetVariantSelectionChange.builder()
                         .previousValue(new com.commercetools.history.models.common.ProductVariantSelectionImpl()) },
-                new Object[] { SetVariantSelectionChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.ProductVariantSelectionImpl()) },
-                new Object[] { SetVariantSelectionChange.builder()
+                new Object[] { "nextValue",
+                        SetVariantSelectionChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.ProductVariantSelectionImpl()) },
+                new Object[] { "product", SetVariantSelectionChange.builder()
                         .product(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetVatIdChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetVatIdChangeTest.java
index d11b43f3312..cd061819c3c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetVatIdChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetVatIdChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetVatIdChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetVatIdChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetVatIdChangeBuilder builder) {
         SetVatIdChange setVatIdChange = builder.buildUnchecked();
         Assertions.assertThat(setVatIdChange).isInstanceOf(SetVatIdChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetVatIdChange.builder().change("change") },
-                new Object[] { SetVatIdChange.builder().previousValue("previousValue") },
-                new Object[] { SetVatIdChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", SetVatIdChange.builder().change("change") },
+                new Object[] { "previousValue", SetVatIdChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", SetVatIdChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/TransitionCustomLineItemStateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/TransitionCustomLineItemStateChangeTest.java
index 4cb19b6635e..0254a567bf0 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/TransitionCustomLineItemStateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/TransitionCustomLineItemStateChangeTest.java
@@ -3,41 +3,34 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TransitionCustomLineItemStateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TransitionCustomLineItemStateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TransitionCustomLineItemStateChangeBuilder builder) {
         TransitionCustomLineItemStateChange transitionCustomLineItemStateChange = builder.buildUnchecked();
         Assertions.assertThat(transitionCustomLineItemStateChange)
                 .isInstanceOf(TransitionCustomLineItemStateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TransitionCustomLineItemStateChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] {
+                new Object[] { "change", TransitionCustomLineItemStateChange.builder().change("change") },
+                new Object[] { "previousValue",
                         TransitionCustomLineItemStateChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ItemStateImpl())) },
-                new Object[] {
+                new Object[] { "nextValue",
                         TransitionCustomLineItemStateChange.builder()
                                 .nextValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ItemStateImpl())) },
-                new Object[] { TransitionCustomLineItemStateChange.builder().lineItemId("lineItemId") },
-                new Object[] { TransitionCustomLineItemStateChange.builder().stateId("stateId") } };
+                new Object[] { "lineItemId", TransitionCustomLineItemStateChange.builder().lineItemId("lineItemId") },
+                new Object[] { "stateId", TransitionCustomLineItemStateChange.builder().stateId("stateId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/TransitionLineItemStateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/TransitionLineItemStateChangeTest.java
index 87c9a72013e..216ab9d6f17 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/TransitionLineItemStateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/TransitionLineItemStateChangeTest.java
@@ -3,40 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TransitionLineItemStateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TransitionLineItemStateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TransitionLineItemStateChangeBuilder builder) {
         TransitionLineItemStateChange transitionLineItemStateChange = builder.buildUnchecked();
         Assertions.assertThat(transitionLineItemStateChange).isInstanceOf(TransitionLineItemStateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TransitionLineItemStateChange.builder().change("change") },
-                new Object[] {
+        return new Object[][] { new Object[] { "change", TransitionLineItemStateChange.builder().change("change") },
+                new Object[] { "previousValue",
                         TransitionLineItemStateChange.builder()
                                 .previousValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ItemStateImpl())) },
-                new Object[] {
+                new Object[] { "nextValue",
                         TransitionLineItemStateChange.builder()
                                 .nextValue(Collections
                                         .singletonList(new com.commercetools.history.models.common.ItemStateImpl())) },
-                new Object[] { TransitionLineItemStateChange.builder().lineItemId("lineItemId") },
-                new Object[] { TransitionLineItemStateChange.builder().stateId("stateId") } };
+                new Object[] { "lineItemId", TransitionLineItemStateChange.builder().lineItemId("lineItemId") },
+                new Object[] { "stateId", TransitionLineItemStateChange.builder().stateId("stateId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/TransitionStateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/TransitionStateChangeTest.java
index 7877cfa51cf..e67c88ef7c2 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/TransitionStateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/TransitionStateChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TransitionStateChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TransitionStateChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TransitionStateChangeBuilder builder) {
         TransitionStateChange transitionStateChange = builder.buildUnchecked();
         Assertions.assertThat(transitionStateChange).isInstanceOf(TransitionStateChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TransitionStateChange.builder().change("change") },
-                new Object[] { TransitionStateChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { TransitionStateChange.builder()
+        return new Object[][] { new Object[] { "change", TransitionStateChange.builder().change("change") },
+                new Object[] { "previousValue",
+                        TransitionStateChange.builder()
+                                .previousValue(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "nextValue", TransitionStateChange.builder()
                         .nextValue(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/UnknownChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/UnknownChangeTest.java
index 83d765f28b0..c63f0cfba3f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/UnknownChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/UnknownChangeTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class UnknownChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(UnknownChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, UnknownChangeBuilder builder) {
         UnknownChange unknownChange = builder.buildUnchecked();
         Assertions.assertThat(unknownChange).isInstanceOf(UnknownChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { UnknownChange.builder().change("change") },
-                new Object[] { UnknownChange.builder().previousValue("previousValue") },
-                new Object[] { UnknownChange.builder().nextValue("nextValue") } };
+        return new Object[][] { new Object[] { "change", UnknownChange.builder().change("change") },
+                new Object[] { "previousValue", UnknownChange.builder().previousValue("previousValue") },
+                new Object[] { "nextValue", UnknownChange.builder().nextValue("nextValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/UnpublishChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/UnpublishChangeTest.java
index fa361c1b12a..1c886aec581 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/UnpublishChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/UnpublishChangeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class UnpublishChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(UnpublishChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, UnpublishChangeBuilder builder) {
         UnpublishChange unpublishChange = builder.buildUnchecked();
         Assertions.assertThat(unpublishChange).isInstanceOf(UnpublishChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { UnpublishChange.builder().change("change") } };
+        return new Object[][] { new Object[] { "change", UnpublishChange.builder().change("change") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/UpdateSyncInfoChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/UpdateSyncInfoChangeTest.java
index 6448c582cd3..bfd43e34c6f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/UpdateSyncInfoChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/UpdateSyncInfoChangeTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class UpdateSyncInfoChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(UpdateSyncInfoChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, UpdateSyncInfoChangeBuilder builder) {
         UpdateSyncInfoChange updateSyncInfoChange = builder.buildUnchecked();
         Assertions.assertThat(updateSyncInfoChange).isInstanceOf(UpdateSyncInfoChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { UpdateSyncInfoChange.builder().change("change") },
-                new Object[] { UpdateSyncInfoChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.SyncInfoImpl()) },
-                new Object[] { UpdateSyncInfoChange.builder().channelId("channelId") } };
+        return new Object[][] { new Object[] { "change", UpdateSyncInfoChange.builder().change("change") },
+                new Object[] { "nextValue",
+                        UpdateSyncInfoChange.builder()
+                                .nextValue(new com.commercetools.history.models.common.SyncInfoImpl()) },
+                new Object[] { "channelId", UpdateSyncInfoChange.builder().channelId("channelId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/VerifyEmailChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/VerifyEmailChangeTest.java
index 3c98ced5095..7b4d05a0f67 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/VerifyEmailChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/VerifyEmailChangeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.change;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class VerifyEmailChangeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(VerifyEmailChangeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, VerifyEmailChangeBuilder builder) {
         VerifyEmailChange verifyEmailChange = builder.buildUnchecked();
         Assertions.assertThat(verifyEmailChange).isInstanceOf(VerifyEmailChange.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { VerifyEmailChange.builder().change("change") } };
+        return new Object[][] { new Object[] { "change", VerifyEmailChange.builder().change("change") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/ErrorObjectTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/ErrorObjectTest.java
index 9ddb77dad5f..652f9439ee7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/ErrorObjectTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/ErrorObjectTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change_history;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ErrorObjectTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ErrorObjectBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ErrorObjectBuilder builder) {
         ErrorObject errorObject = builder.buildUnchecked();
         Assertions.assertThat(errorObject).isInstanceOf(ErrorObject.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ErrorObject.builder().code("code") },
-                new Object[] { ErrorObject.builder().message("message") } };
+        return new Object[][] { new Object[] { "code", ErrorObject.builder().code("code") },
+                new Object[] { "message", ErrorObject.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/ErrorResponseTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/ErrorResponseTest.java
index 5d0075a7113..47e00b540d2 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/ErrorResponseTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/ErrorResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ErrorResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ErrorResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ErrorResponseBuilder builder) {
         ErrorResponse errorResponse = builder.buildUnchecked();
         Assertions.assertThat(errorResponse).isInstanceOf(ErrorResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ErrorResponse.builder().statusCode(8) },
-                new Object[] { ErrorResponse.builder().message("message") },
-                new Object[] { ErrorResponse.builder().error("error") },
-                new Object[] { ErrorResponse.builder().error_description("error_description") },
-                new Object[] { ErrorResponse.builder()
-                        .errors(Collections.singletonList(
-                            new com.commercetools.history.models.change_history.ErrorObjectImpl())) } };
+        return new Object[][] { new Object[] { "statusCode", ErrorResponse.builder().statusCode(8) },
+                new Object[] { "message", ErrorResponse.builder().message("message") },
+                new Object[] { "error", ErrorResponse.builder().error("error") },
+                new Object[] { "error_description", ErrorResponse.builder().error_description("error_description") },
+                new Object[] { "errors",
+                        ErrorResponse.builder()
+                                .errors(Collections.singletonList(
+                                    new com.commercetools.history.models.change_history.ErrorObjectImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/ModifiedByTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/ModifiedByTest.java
index c8d2d40397a..cc173b9f78a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/ModifiedByTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/ModifiedByTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.history.models.change_history;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ModifiedByTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ModifiedByBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ModifiedByBuilder builder) {
         ModifiedBy modifiedBy = builder.buildUnchecked();
         Assertions.assertThat(modifiedBy).isInstanceOf(ModifiedBy.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ModifiedBy.builder().isPlatformClient(true) },
-                new Object[] { ModifiedBy.builder().id("id") }, new Object[] { ModifiedBy.builder().type("type") },
-                new Object[] { ModifiedBy.builder().clientId("clientId") },
-                new Object[] { ModifiedBy.builder().anonymousId("anonymousId") },
-                new Object[] {
+        return new Object[][] { new Object[] { "isPlatformClient", ModifiedBy.builder().isPlatformClient(true) },
+                new Object[] { "id", ModifiedBy.builder().id("id") },
+                new Object[] { "type", ModifiedBy.builder().type("type") },
+                new Object[] { "clientId", ModifiedBy.builder().clientId("clientId") },
+                new Object[] { "anonymousId", ModifiedBy.builder().anonymousId("anonymousId") },
+                new Object[] { "customer",
                         ModifiedBy.builder().customer(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] {
+                new Object[] { "associate",
                         ModifiedBy.builder().associate(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/RecordPagedQueryResponseTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/RecordPagedQueryResponseTest.java
index 88c710b4026..4257876febb 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/RecordPagedQueryResponseTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/RecordPagedQueryResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RecordPagedQueryResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RecordPagedQueryResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RecordPagedQueryResponseBuilder builder) {
         RecordPagedQueryResponse recordPagedQueryResponse = builder.buildUnchecked();
         Assertions.assertThat(recordPagedQueryResponse).isInstanceOf(RecordPagedQueryResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RecordPagedQueryResponse.builder().limit(7) },
-                new Object[] { RecordPagedQueryResponse.builder().count(2) },
-                new Object[] { RecordPagedQueryResponse.builder().total(1) },
-                new Object[] { RecordPagedQueryResponse.builder().offset(3) },
-                new Object[] { RecordPagedQueryResponse.builder()
-                        .results(Collections
-                                .singletonList(new com.commercetools.history.models.change_history.RecordImpl())) } };
+        return new Object[][] { new Object[] { "limit", RecordPagedQueryResponse.builder().limit(7) },
+                new Object[] { "count", RecordPagedQueryResponse.builder().count(2) },
+                new Object[] { "total", RecordPagedQueryResponse.builder().total(1) },
+                new Object[] { "offset", RecordPagedQueryResponse.builder().offset(3) },
+                new Object[] { "results",
+                        RecordPagedQueryResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.history.models.change_history.RecordImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/RecordTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/RecordTest.java
index 296641004bb..d369f7f25f6 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/RecordTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_history/RecordTest.java
@@ -3,46 +3,46 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RecordTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RecordBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RecordBuilder builder) {
         Record record = builder.buildUnchecked();
         Assertions.assertThat(record).isInstanceOf(Record.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Record.builder().version(2) },
-                new Object[] { Record.builder().previousVersion(9) }, new Object[] { Record.builder().type("type") },
-                new Object[] { Record.builder()
-                        .modifiedBy(new com.commercetools.history.models.change_history.ModifiedByImpl()) },
-                new Object[] { Record.builder().modifiedAt("modifiedAt") },
-                new Object[] { Record.builder().label(new com.commercetools.history.models.label.LabelImpl()) },
-                new Object[] { Record.builder().previousLabel(new com.commercetools.history.models.label.LabelImpl()) },
-                new Object[] { Record.builder()
-                        .changes(Collections.singletonList(new com.commercetools.history.models.change.ChangeImpl())) },
-                new Object[] { Record.builder()
-                        .resource(new com.commercetools.history.models.common.ResourceIdentifierImpl()) },
-                new Object[] { Record.builder()
-                        .stores(Collections
-                                .singletonList(new com.commercetools.history.models.common.KeyReferenceImpl())) },
-                new Object[] {
+        return new Object[][] { new Object[] { "version", Record.builder().version(2) },
+                new Object[] { "previousVersion", Record.builder().previousVersion(9) },
+                new Object[] { "type", Record.builder().type("type") },
+                new Object[] { "modifiedBy",
+                        Record.builder()
+                                .modifiedBy(new com.commercetools.history.models.change_history.ModifiedByImpl()) },
+                new Object[] { "modifiedAt", Record.builder().modifiedAt("modifiedAt") },
+                new Object[] { "label",
+                        Record.builder().label(new com.commercetools.history.models.label.LabelImpl()) },
+                new Object[] { "previousLabel",
+                        Record.builder().previousLabel(new com.commercetools.history.models.label.LabelImpl()) },
+                new Object[] { "changes",
+                        Record.builder()
+                                .changes(Collections
+                                        .singletonList(new com.commercetools.history.models.change.ChangeImpl())) },
+                new Object[] { "resource",
+                        Record.builder()
+                                .resource(new com.commercetools.history.models.common.ResourceIdentifierImpl()) },
+                new Object[] { "stores",
+                        Record.builder()
+                                .stores(Collections.singletonList(
+                                    new com.commercetools.history.models.common.KeyReferenceImpl())) },
+                new Object[] { "businessUnit",
                         Record.builder().businessUnit(new com.commercetools.history.models.common.KeyReferenceImpl()) },
-                new Object[] { Record.builder().withoutChanges(true) } };
+                new Object[] { "withoutChanges", Record.builder().withoutChanges(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/AssetChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/AssetChangeValueTest.java
index 72432a6f4f7..b9783f1334d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/AssetChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/AssetChangeValueTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssetChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssetChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssetChangeValueBuilder builder) {
         AssetChangeValue assetChangeValue = builder.buildUnchecked();
         Assertions.assertThat(assetChangeValue).isInstanceOf(AssetChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssetChangeValue.builder().id("id") }, new Object[] {
+        return new Object[][] { new Object[] { "id", AssetChangeValue.builder().id("id") }, new Object[] { "name",
                 AssetChangeValue.builder().name(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/AttributeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/AttributeValueTest.java
index 83c3423fdc8..8ba2eed156b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/AttributeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/AttributeValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeValueBuilder builder) {
         AttributeValue attributeValue = builder.buildUnchecked();
         Assertions.assertThat(attributeValue).isInstanceOf(AttributeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeValue.builder().name("name") },
-                new Object[] { AttributeValue.builder().value("value") } };
+        return new Object[][] { new Object[] { "name", AttributeValue.builder().name("name") },
+                new Object[] { "value", AttributeValue.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetCustomLineItemsChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetCustomLineItemsChangeValueTest.java
index 560a4dc682f..bf621120851 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetCustomLineItemsChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetCustomLineItemsChangeValueTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTargetCustomLineItemsChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTargetCustomLineItemsChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTargetCustomLineItemsChangeValueBuilder builder) {
         ChangeTargetCustomLineItemsChangeValue changeTargetCustomLineItemsChangeValue = builder.buildUnchecked();
         Assertions.assertThat(changeTargetCustomLineItemsChangeValue)
                 .isInstanceOf(ChangeTargetCustomLineItemsChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ChangeTargetCustomLineItemsChangeValue.builder().predicate("predicate") } };
+                new Object[] { "predicate", ChangeTargetCustomLineItemsChangeValue.builder().predicate("predicate") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetLineItemsChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetLineItemsChangeValueTest.java
index cdc0159947a..5ed53d004a3 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetLineItemsChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetLineItemsChangeValueTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTargetLineItemsChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTargetLineItemsChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTargetLineItemsChangeValueBuilder builder) {
         ChangeTargetLineItemsChangeValue changeTargetLineItemsChangeValue = builder.buildUnchecked();
         Assertions.assertThat(changeTargetLineItemsChangeValue).isInstanceOf(ChangeTargetLineItemsChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeTargetLineItemsChangeValue.builder().predicate("predicate") } };
+        return new Object[][] {
+                new Object[] { "predicate", ChangeTargetLineItemsChangeValue.builder().predicate("predicate") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetMultiBuyCustomLineItemsChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetMultiBuyCustomLineItemsChangeValueTest.java
index 2071ca0ae2a..ce3ed91f4f6 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetMultiBuyCustomLineItemsChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetMultiBuyCustomLineItemsChangeValueTest.java
@@ -1,37 +1,33 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTargetMultiBuyCustomLineItemsChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTargetMultiBuyCustomLineItemsChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTargetMultiBuyCustomLineItemsChangeValueBuilder builder) {
         ChangeTargetMultiBuyCustomLineItemsChangeValue changeTargetMultiBuyCustomLineItemsChangeValue = builder
                 .buildUnchecked();
         Assertions.assertThat(changeTargetMultiBuyCustomLineItemsChangeValue)
                 .isInstanceOf(ChangeTargetMultiBuyCustomLineItemsChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ChangeTargetMultiBuyCustomLineItemsChangeValue.builder().predicate("predicate") },
-                new Object[] { ChangeTargetMultiBuyCustomLineItemsChangeValue.builder().triggerQuantity(8) },
-                new Object[] { ChangeTargetMultiBuyCustomLineItemsChangeValue.builder().discountedQuantity(3) },
-                new Object[] { ChangeTargetMultiBuyCustomLineItemsChangeValue.builder().maxOccurrence(7) },
-                new Object[] { ChangeTargetMultiBuyCustomLineItemsChangeValue.builder()
+                new Object[] { "predicate",
+                        ChangeTargetMultiBuyCustomLineItemsChangeValue.builder().predicate("predicate") },
+                new Object[] { "triggerQuantity",
+                        ChangeTargetMultiBuyCustomLineItemsChangeValue.builder().triggerQuantity(8) },
+                new Object[] { "discountedQuantity",
+                        ChangeTargetMultiBuyCustomLineItemsChangeValue.builder().discountedQuantity(3) },
+                new Object[] { "maxOccurrence",
+                        ChangeTargetMultiBuyCustomLineItemsChangeValue.builder().maxOccurrence(7) },
+                new Object[] { "selectionMode", ChangeTargetMultiBuyCustomLineItemsChangeValue.builder()
                         .selectionMode(com.commercetools.history.models.common.SelectionMode.findEnum("Cheapest")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetMultiBuyLineItemsChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetMultiBuyLineItemsChangeValueTest.java
index af82cc7eba1..35f3b3bcbb4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetMultiBuyLineItemsChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetMultiBuyLineItemsChangeValueTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTargetMultiBuyLineItemsChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTargetMultiBuyLineItemsChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTargetMultiBuyLineItemsChangeValueBuilder builder) {
         ChangeTargetMultiBuyLineItemsChangeValue changeTargetMultiBuyLineItemsChangeValue = builder.buildUnchecked();
         Assertions.assertThat(changeTargetMultiBuyLineItemsChangeValue)
                 .isInstanceOf(ChangeTargetMultiBuyLineItemsChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ChangeTargetMultiBuyLineItemsChangeValue.builder().predicate("predicate") },
-                new Object[] { ChangeTargetMultiBuyLineItemsChangeValue.builder().triggerQuantity(8) },
-                new Object[] { ChangeTargetMultiBuyLineItemsChangeValue.builder().discountedQuantity(3) },
-                new Object[] { ChangeTargetMultiBuyLineItemsChangeValue.builder().maxOccurrence(7) },
-                new Object[] { ChangeTargetMultiBuyLineItemsChangeValue.builder()
+                new Object[] { "predicate", ChangeTargetMultiBuyLineItemsChangeValue.builder().predicate("predicate") },
+                new Object[] { "triggerQuantity",
+                        ChangeTargetMultiBuyLineItemsChangeValue.builder().triggerQuantity(8) },
+                new Object[] { "discountedQuantity",
+                        ChangeTargetMultiBuyLineItemsChangeValue.builder().discountedQuantity(3) },
+                new Object[] { "maxOccurrence", ChangeTargetMultiBuyLineItemsChangeValue.builder().maxOccurrence(7) },
+                new Object[] { "selectionMode", ChangeTargetMultiBuyLineItemsChangeValue.builder()
                         .selectionMode(com.commercetools.history.models.common.SelectionMode.findEnum("Cheapest")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetPatternChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetPatternChangeValueTest.java
index c5f9fdfec8a..ccb77c48837 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetPatternChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetPatternChangeValueTest.java
@@ -3,38 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTargetPatternChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeTargetPatternChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeTargetPatternChangeValueBuilder builder) {
         ChangeTargetPatternChangeValue changeTargetPatternChangeValue = builder.buildUnchecked();
         Assertions.assertThat(changeTargetPatternChangeValue).isInstanceOf(ChangeTargetPatternChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ChangeTargetPatternChangeValue.builder()
-                        .triggerPattern(Collections.singletonList(
-                            new com.commercetools.history.models.cart_discount.PatternComponentImpl())) },
-                new Object[] { ChangeTargetPatternChangeValue.builder()
-                        .targetPattern(Collections.singletonList(
-                            new com.commercetools.history.models.cart_discount.PatternComponentImpl())) },
-                new Object[] { ChangeTargetPatternChangeValue.builder().maxOccurrence(7) },
-                new Object[] { ChangeTargetPatternChangeValue.builder()
+                new Object[] { "triggerPattern",
+                        ChangeTargetPatternChangeValue.builder()
+                                .triggerPattern(Collections.singletonList(
+                                    new com.commercetools.history.models.cart_discount.PatternComponentImpl())) },
+                new Object[] { "targetPattern",
+                        ChangeTargetPatternChangeValue.builder()
+                                .targetPattern(Collections.singletonList(
+                                    new com.commercetools.history.models.cart_discount.PatternComponentImpl())) },
+                new Object[] { "maxOccurrence", ChangeTargetPatternChangeValue.builder().maxOccurrence(7) },
+                new Object[] { "selectionMode", ChangeTargetPatternChangeValue.builder()
                         .selectionMode(com.commercetools.history.models.common.SelectionMode.findEnum("Cheapest")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetShippingChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetShippingChangeValueTest.java
index ef8d8350e6a..84bd2413992 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetShippingChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeTargetShippingChangeValueTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeTargetShippingChangeValueTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueAbsoluteChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueAbsoluteChangeValueTest.java
index af980acf911..cbfae49cc70 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueAbsoluteChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueAbsoluteChangeValueTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeValueAbsoluteChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeValueAbsoluteChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeValueAbsoluteChangeValueBuilder builder) {
         ChangeValueAbsoluteChangeValue changeValueAbsoluteChangeValue = builder.buildUnchecked();
         Assertions.assertThat(changeValueAbsoluteChangeValue).isInstanceOf(ChangeValueAbsoluteChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeValueAbsoluteChangeValue.builder()
+        return new Object[][] { new Object[] { "money", ChangeValueAbsoluteChangeValue.builder()
                 .money(Collections.singletonList(new com.commercetools.history.models.common.MoneyImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueExternalChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueExternalChangeValueTest.java
index ea66a7caac7..0ee0ba9488f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueExternalChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueExternalChangeValueTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeValueExternalChangeValueTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueGiftLineItemChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueGiftLineItemChangeValueTest.java
index 544619fa184..44461286a73 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueGiftLineItemChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueGiftLineItemChangeValueTest.java
@@ -1,37 +1,31 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeValueGiftLineItemChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeValueGiftLineItemChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeValueGiftLineItemChangeValueBuilder builder) {
         ChangeValueGiftLineItemChangeValue changeValueGiftLineItemChangeValue = builder.buildUnchecked();
         Assertions.assertThat(changeValueGiftLineItemChangeValue)
                 .isInstanceOf(ChangeValueGiftLineItemChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ChangeValueGiftLineItemChangeValue.builder()
-                        .product(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { ChangeValueGiftLineItemChangeValue.builder().variantId(5) },
-                new Object[] { ChangeValueGiftLineItemChangeValue.builder()
-                        .supplyChannel(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { ChangeValueGiftLineItemChangeValue.builder()
+                new Object[] { "product",
+                        ChangeValueGiftLineItemChangeValue.builder()
+                                .product(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "variantId", ChangeValueGiftLineItemChangeValue.builder().variantId(5) },
+                new Object[] { "supplyChannel",
+                        ChangeValueGiftLineItemChangeValue.builder()
+                                .supplyChannel(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "distributionChannel", ChangeValueGiftLineItemChangeValue.builder()
                         .distributionChannel(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueRelativeChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueRelativeChangeValueTest.java
index 39c37c50ded..942c3036fd4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueRelativeChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ChangeValueRelativeChangeValueTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChangeValueRelativeChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ChangeValueRelativeChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ChangeValueRelativeChangeValueBuilder builder) {
         ChangeValueRelativeChangeValue changeValueRelativeChangeValue = builder.buildUnchecked();
         Assertions.assertThat(changeValueRelativeChangeValue).isInstanceOf(ChangeValueRelativeChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ChangeValueRelativeChangeValue.builder().permyriad(1) } };
+        return new Object[][] { new Object[] { "permyriad", ChangeValueRelativeChangeValue.builder().permyriad(1) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/CustomFieldExpandedValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/CustomFieldExpandedValueTest.java
index efa578f192d..99f7bb9c7a1 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/CustomFieldExpandedValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/CustomFieldExpandedValueTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldExpandedValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldExpandedValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldExpandedValueBuilder builder) {
         CustomFieldExpandedValue customFieldExpandedValue = builder.buildUnchecked();
         Assertions.assertThat(customFieldExpandedValue).isInstanceOf(CustomFieldExpandedValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomFieldExpandedValue.builder().name("name") },
-                new Object[] { CustomFieldExpandedValue.builder().value("value") },
-                new Object[] { CustomFieldExpandedValue.builder()
+        return new Object[][] { new Object[] { "name", CustomFieldExpandedValue.builder().name("name") },
+                new Object[] { "value", CustomFieldExpandedValue.builder().value("value") },
+                new Object[] { "label", CustomFieldExpandedValue.builder()
                         .label(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/CustomShippingMethodChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/CustomShippingMethodChangeValueTest.java
index 882cd6ccc3d..54a5fe9e741 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/CustomShippingMethodChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/CustomShippingMethodChangeValueTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomShippingMethodChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomShippingMethodChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomShippingMethodChangeValueBuilder builder) {
         CustomShippingMethodChangeValue customShippingMethodChangeValue = builder.buildUnchecked();
         Assertions.assertThat(customShippingMethodChangeValue).isInstanceOf(CustomShippingMethodChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomShippingMethodChangeValue.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", CustomShippingMethodChangeValue.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/DeliveryChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/DeliveryChangeValueTest.java
index c9aacc11c2c..5910e3f2191 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/DeliveryChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/DeliveryChangeValueTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryChangeValueBuilder builder) {
         DeliveryChangeValue deliveryChangeValue = builder.buildUnchecked();
         Assertions.assertThat(deliveryChangeValue).isInstanceOf(DeliveryChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DeliveryChangeValue.builder()
-                        .items(Collections
-                                .singletonList(new com.commercetools.history.models.common.DeliveryItemImpl())) },
-                new Object[] { DeliveryChangeValue.builder()
-                        .address(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { DeliveryChangeValue.builder()
+                new Object[] { "items",
+                        DeliveryChangeValue.builder()
+                                .items(Collections.singletonList(
+                                    new com.commercetools.history.models.common.DeliveryItemImpl())) },
+                new Object[] { "address",
+                        DeliveryChangeValue.builder()
+                                .address(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "parcels", DeliveryChangeValue.builder()
                         .parcels(
                             Collections.singletonList(new com.commercetools.history.models.common.ParcelImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/EnumValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/EnumValueTest.java
index 202d4fff751..15cfc1c97a9 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/EnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/EnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EnumValueBuilder builder) {
         EnumValue enumValue = builder.buildUnchecked();
         Assertions.assertThat(enumValue).isInstanceOf(EnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EnumValue.builder().key("key") },
-                new Object[] { EnumValue.builder().label("label") } };
+        return new Object[][] { new Object[] { "key", EnumValue.builder().key("key") },
+                new Object[] { "label", EnumValue.builder().label("label") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/FieldDefinitionOrderValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/FieldDefinitionOrderValueTest.java
index e140b41be07..f48bb06dbce 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/FieldDefinitionOrderValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/FieldDefinitionOrderValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class FieldDefinitionOrderValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(FieldDefinitionOrderValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, FieldDefinitionOrderValueBuilder builder) {
         FieldDefinitionOrderValue fieldDefinitionOrderValue = builder.buildUnchecked();
         Assertions.assertThat(fieldDefinitionOrderValue).isInstanceOf(FieldDefinitionOrderValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { FieldDefinitionOrderValue.builder().name("name") },
-                new Object[] { FieldDefinitionOrderValue.builder()
+        return new Object[][] { new Object[] { "name", FieldDefinitionOrderValue.builder().name("name") },
+                new Object[] { "label", FieldDefinitionOrderValue.builder()
                         .label(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/InventoryQuantityValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/InventoryQuantityValueTest.java
index 0151cbab51b..611ac9ce937 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/InventoryQuantityValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/InventoryQuantityValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryQuantityValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryQuantityValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryQuantityValueBuilder builder) {
         InventoryQuantityValue inventoryQuantityValue = builder.buildUnchecked();
         Assertions.assertThat(inventoryQuantityValue).isInstanceOf(InventoryQuantityValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryQuantityValue.builder().quantityOnStock(2) },
-                new Object[] { InventoryQuantityValue.builder().availableQuantity(3) } };
+        return new Object[][] { new Object[] { "quantityOnStock", InventoryQuantityValue.builder().quantityOnStock(2) },
+                new Object[] { "availableQuantity", InventoryQuantityValue.builder().availableQuantity(3) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/LocalizedEnumValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/LocalizedEnumValueTest.java
index 58f2da99c61..e75963fa859 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/LocalizedEnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/LocalizedEnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizedEnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocalizedEnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocalizedEnumValueBuilder builder) {
         LocalizedEnumValue localizedEnumValue = builder.buildUnchecked();
         Assertions.assertThat(localizedEnumValue).isInstanceOf(LocalizedEnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LocalizedEnumValue.builder().key("key") },
-                new Object[] { LocalizedEnumValue.builder()
+        return new Object[][] { new Object[] { "key", LocalizedEnumValue.builder().key("key") },
+                new Object[] { "label", LocalizedEnumValue.builder()
                         .label(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ParcelChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ParcelChangeValueTest.java
index 48996bb9d6a..e610057c519 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ParcelChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ParcelChangeValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelChangeValueBuilder builder) {
         ParcelChangeValue parcelChangeValue = builder.buildUnchecked();
         Assertions.assertThat(parcelChangeValue).isInstanceOf(ParcelChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelChangeValue.builder().id("id") },
-                new Object[] { ParcelChangeValue.builder().createdAt("createdAt") } };
+        return new Object[][] { new Object[] { "id", ParcelChangeValue.builder().id("id") },
+                new Object[] { "createdAt", ParcelChangeValue.builder().createdAt("createdAt") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/SetCartClassificationShippingRateInputValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/SetCartClassificationShippingRateInputValueTest.java
index be43aeaf371..aeb6354a31e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/SetCartClassificationShippingRateInputValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/SetCartClassificationShippingRateInputValueTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCartClassificationShippingRateInputValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCartClassificationShippingRateInputValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCartClassificationShippingRateInputValueBuilder builder) {
         SetCartClassificationShippingRateInputValue setCartClassificationShippingRateInputValue = builder
                 .buildUnchecked();
         Assertions.assertThat(setCartClassificationShippingRateInputValue)
                 .isInstanceOf(SetCartClassificationShippingRateInputValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCartClassificationShippingRateInputValue.builder().type("type") },
-                new Object[] { SetCartClassificationShippingRateInputValue.builder().key("key") },
-                new Object[] { SetCartClassificationShippingRateInputValue.builder()
+        return new Object[][] {
+                new Object[] { "type", SetCartClassificationShippingRateInputValue.builder().type("type") },
+                new Object[] { "key", SetCartClassificationShippingRateInputValue.builder().key("key") },
+                new Object[] { "label", SetCartClassificationShippingRateInputValue.builder()
                         .label(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/SetCartScoreShippingRateInputValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/SetCartScoreShippingRateInputValueTest.java
index 17f8ebb607d..09ff4c51ee3 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/SetCartScoreShippingRateInputValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/SetCartScoreShippingRateInputValueTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SetCartScoreShippingRateInputValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SetCartScoreShippingRateInputValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SetCartScoreShippingRateInputValueBuilder builder) {
         SetCartScoreShippingRateInputValue setCartScoreShippingRateInputValue = builder.buildUnchecked();
         Assertions.assertThat(setCartScoreShippingRateInputValue)
                 .isInstanceOf(SetCartScoreShippingRateInputValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SetCartScoreShippingRateInputValue.builder().type("type") },
-                new Object[] { SetCartScoreShippingRateInputValue.builder().score(9) } };
+        return new Object[][] { new Object[] { "type", SetCartScoreShippingRateInputValue.builder().type("type") },
+                new Object[] { "score", SetCartScoreShippingRateInputValue.builder().score(9) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ShippingMethodChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ShippingMethodChangeValueTest.java
index 5cdeb7e938f..089df728fa7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ShippingMethodChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ShippingMethodChangeValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodChangeValueBuilder builder) {
         ShippingMethodChangeValue shippingMethodChangeValue = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodChangeValue).isInstanceOf(ShippingMethodChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingMethodChangeValue.builder().id("id") },
-                new Object[] { ShippingMethodChangeValue.builder().name("name") } };
+        return new Object[][] { new Object[] { "id", ShippingMethodChangeValue.builder().id("id") },
+                new Object[] { "name", ShippingMethodChangeValue.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ShippingMethodTaxAmountChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ShippingMethodTaxAmountChangeValueTest.java
index 00c07bd1c04..348817a9afc 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ShippingMethodTaxAmountChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ShippingMethodTaxAmountChangeValueTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodTaxAmountChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingMethodTaxAmountChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingMethodTaxAmountChangeValueBuilder builder) {
         ShippingMethodTaxAmountChangeValue shippingMethodTaxAmountChangeValue = builder.buildUnchecked();
         Assertions.assertThat(shippingMethodTaxAmountChangeValue)
                 .isInstanceOf(ShippingMethodTaxAmountChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShippingMethodTaxAmountChangeValue.builder()
-                        .taxedPrice(new com.commercetools.history.models.common.TaxedPriceImpl()) },
-                new Object[] { ShippingMethodTaxAmountChangeValue.builder()
+                new Object[] { "taxedPrice",
+                        ShippingMethodTaxAmountChangeValue.builder()
+                                .taxedPrice(new com.commercetools.history.models.common.TaxedPriceImpl()) },
+                new Object[] { "taxRate", ShippingMethodTaxAmountChangeValue.builder()
                         .taxRate(new com.commercetools.history.models.common.TaxRateImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ShoppingListLineItemValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ShoppingListLineItemValueTest.java
index e1a189517b0..96b1787be11 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ShoppingListLineItemValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ShoppingListLineItemValueTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShoppingListLineItemValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShoppingListLineItemValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShoppingListLineItemValueBuilder builder) {
         ShoppingListLineItemValue shoppingListLineItemValue = builder.buildUnchecked();
         Assertions.assertThat(shoppingListLineItemValue).isInstanceOf(ShoppingListLineItemValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShoppingListLineItemValue.builder().id("id") },
-                new Object[] { ShoppingListLineItemValue.builder()
-                        .name(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ShoppingListLineItemValue.builder().variantId(5) } };
+        return new Object[][] { new Object[] { "id", ShoppingListLineItemValue.builder().id("id") },
+                new Object[] { "name",
+                        ShoppingListLineItemValue.builder()
+                                .name(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "variantId", ShoppingListLineItemValue.builder().variantId(5) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/TextLineItemValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/TextLineItemValueTest.java
index 99a1d834f9e..8f44548959f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/TextLineItemValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/TextLineItemValueTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TextLineItemValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TextLineItemValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TextLineItemValueBuilder builder) {
         TextLineItemValue textLineItemValue = builder.buildUnchecked();
         Assertions.assertThat(textLineItemValue).isInstanceOf(TextLineItemValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TextLineItemValue.builder().id("id") }, new Object[] {
+        return new Object[][] { new Object[] { "id", TextLineItemValue.builder().id("id") }, new Object[] { "name",
                 TextLineItemValue.builder().name(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/TransactionChangeValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/TransactionChangeValueTest.java
index 19beea3f4cd..1751ae239a2 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/TransactionChangeValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/TransactionChangeValueTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TransactionChangeValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TransactionChangeValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TransactionChangeValueBuilder builder) {
         TransactionChangeValue transactionChangeValue = builder.buildUnchecked();
         Assertions.assertThat(transactionChangeValue).isInstanceOf(TransactionChangeValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TransactionChangeValue.builder().id("id") },
-                new Object[] { TransactionChangeValue.builder().interactionId("interactionId") },
-                new Object[] { TransactionChangeValue.builder().timestamp("timestamp") } };
+        return new Object[][] { new Object[] { "id", TransactionChangeValue.builder().id("id") },
+                new Object[] { "interactionId", TransactionChangeValue.builder().interactionId("interactionId") },
+                new Object[] { "timestamp", TransactionChangeValue.builder().timestamp("timestamp") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ValidFromAndUntilValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ValidFromAndUntilValueTest.java
index 0dde4cc6977..1c529ed0ec7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ValidFromAndUntilValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change_value/ValidFromAndUntilValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.change_value;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ValidFromAndUntilValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ValidFromAndUntilValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ValidFromAndUntilValueBuilder builder) {
         ValidFromAndUntilValue validFromAndUntilValue = builder.buildUnchecked();
         Assertions.assertThat(validFromAndUntilValue).isInstanceOf(ValidFromAndUntilValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ValidFromAndUntilValue.builder().validFrom("validFrom") },
-                new Object[] { ValidFromAndUntilValue.builder().validUntil("validUntil") } };
+        return new Object[][] { new Object[] { "validFrom", ValidFromAndUntilValue.builder().validFrom("validFrom") },
+                new Object[] { "validUntil", ValidFromAndUntilValue.builder().validUntil("validUntil") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AddressTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AddressTest.java
index fb52508d51f..5ee15aeb897 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AddressTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AddressTest.java
@@ -1,50 +1,47 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddressTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddressBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddressBuilder builder) {
         Address address = builder.buildUnchecked();
         Assertions.assertThat(address).isInstanceOf(Address.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Address.builder().id("id") },
-                new Object[] { Address.builder().key("key") }, new Object[] { Address.builder().title("title") },
-                new Object[] { Address.builder().salutation("salutation") },
-                new Object[] { Address.builder().firstName("firstName") },
-                new Object[] { Address.builder().lastName("lastName") },
-                new Object[] { Address.builder().streetName("streetName") },
-                new Object[] { Address.builder().streetNumber("streetNumber") },
-                new Object[] { Address.builder().additionalStreetInfo("additionalStreetInfo") },
-                new Object[] { Address.builder().postalCode("postalCode") },
-                new Object[] { Address.builder().city("city") }, new Object[] { Address.builder().region("region") },
-                new Object[] { Address.builder().state("state") },
-                new Object[] { Address.builder().country("country") },
-                new Object[] { Address.builder().company("company") },
-                new Object[] { Address.builder().department("department") },
-                new Object[] { Address.builder().building("building") },
-                new Object[] { Address.builder().apartment("apartment") },
-                new Object[] { Address.builder().pOBox("pOBox") }, new Object[] { Address.builder().phone("phone") },
-                new Object[] { Address.builder().mobile("mobile") }, new Object[] { Address.builder().email("email") },
-                new Object[] { Address.builder().fax("fax") },
-                new Object[] { Address.builder().additionalAddressInfo("additionalAddressInfo") },
-                new Object[] { Address.builder().externalId("externalId") } };
+        return new Object[][] { new Object[] { "id", Address.builder().id("id") },
+                new Object[] { "key", Address.builder().key("key") },
+                new Object[] { "title", Address.builder().title("title") },
+                new Object[] { "salutation", Address.builder().salutation("salutation") },
+                new Object[] { "firstName", Address.builder().firstName("firstName") },
+                new Object[] { "lastName", Address.builder().lastName("lastName") },
+                new Object[] { "streetName", Address.builder().streetName("streetName") },
+                new Object[] { "streetNumber", Address.builder().streetNumber("streetNumber") },
+                new Object[] { "additionalStreetInfo", Address.builder().additionalStreetInfo("additionalStreetInfo") },
+                new Object[] { "postalCode", Address.builder().postalCode("postalCode") },
+                new Object[] { "city", Address.builder().city("city") },
+                new Object[] { "region", Address.builder().region("region") },
+                new Object[] { "state", Address.builder().state("state") },
+                new Object[] { "country", Address.builder().country("country") },
+                new Object[] { "company", Address.builder().company("company") },
+                new Object[] { "department", Address.builder().department("department") },
+                new Object[] { "building", Address.builder().building("building") },
+                new Object[] { "apartment", Address.builder().apartment("apartment") },
+                new Object[] { "pOBox", Address.builder().pOBox("pOBox") },
+                new Object[] { "phone", Address.builder().phone("phone") },
+                new Object[] { "mobile", Address.builder().mobile("mobile") },
+                new Object[] { "email", Address.builder().email("email") },
+                new Object[] { "fax", Address.builder().fax("fax") },
+                new Object[] { "additionalAddressInfo",
+                        Address.builder().additionalAddressInfo("additionalAddressInfo") },
+                new Object[] { "externalId", Address.builder().externalId("externalId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssetDimensionsTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssetDimensionsTest.java
index dbe107eefa6..c33a5317402 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssetDimensionsTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssetDimensionsTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssetDimensionsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssetDimensionsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssetDimensionsBuilder builder) {
         AssetDimensions assetDimensions = builder.buildUnchecked();
         Assertions.assertThat(assetDimensions).isInstanceOf(AssetDimensions.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssetDimensions.builder().w(5) },
-                new Object[] { AssetDimensions.builder().h(6) } };
+        return new Object[][] { new Object[] { "w", AssetDimensions.builder().w(5) },
+                new Object[] { "h", AssetDimensions.builder().h(6) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssetSourceTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssetSourceTest.java
index 3a559a9960a..779d86378fa 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssetSourceTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssetSourceTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssetSourceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssetSourceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssetSourceBuilder builder) {
         AssetSource assetSource = builder.buildUnchecked();
         Assertions.assertThat(assetSource).isInstanceOf(AssetSource.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssetSource.builder().uri("uri") },
-                new Object[] { AssetSource.builder().key("key") },
-                new Object[] { AssetSource.builder()
-                        .dimensions(new com.commercetools.history.models.common.AssetDimensionsImpl()) },
-                new Object[] { AssetSource.builder().contentType("contentType") } };
+        return new Object[][] { new Object[] { "uri", AssetSource.builder().uri("uri") },
+                new Object[] { "key", AssetSource.builder().key("key") },
+                new Object[] { "dimensions",
+                        AssetSource.builder()
+                                .dimensions(new com.commercetools.history.models.common.AssetDimensionsImpl()) },
+                new Object[] { "contentType", AssetSource.builder().contentType("contentType") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssetTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssetTest.java
index d467348b3fb..e07c430a6ef 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssetTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssetTest.java
@@ -1,36 +1,30 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssetTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssetBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssetBuilder builder) {
         Asset asset = builder.buildUnchecked();
         Assertions.assertThat(asset).isInstanceOf(Asset.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Asset.builder().id("id") },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Asset.builder().id("id") },
+                new Object[] { "name",
                         Asset.builder().name(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { Asset.builder()
-                        .description(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { Asset.builder().custom(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { Asset.builder().key("key") } };
+                new Object[] { "description",
+                        Asset.builder()
+                                .description(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "custom",
+                        Asset.builder().custom(new com.commercetools.history.models.common.CustomFieldsImpl()) },
+                new Object[] { "key", Asset.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssociateRoleAssignmentTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssociateRoleAssignmentTest.java
index 42817f90baf..83d74f42b3d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssociateRoleAssignmentTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssociateRoleAssignmentTest.java
@@ -1,35 +1,29 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleAssignmentTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleAssignmentBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleAssignmentBuilder builder) {
         AssociateRoleAssignment associateRoleAssignment = builder.buildUnchecked();
         Assertions.assertThat(associateRoleAssignment).isInstanceOf(AssociateRoleAssignment.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { AssociateRoleAssignment.builder()
-                        .associateRole(new com.commercetools.history.models.common.KeyReferenceImpl()) },
-                new Object[] { AssociateRoleAssignment.builder()
-                        .inheritance(com.commercetools.history.models.common.AssociateRoleInheritanceMode
-                                .findEnum("Enabled")) } };
+                new Object[] { "associateRole",
+                        AssociateRoleAssignment.builder()
+                                .associateRole(new com.commercetools.history.models.common.KeyReferenceImpl()) },
+                new Object[] { "inheritance",
+                        AssociateRoleAssignment.builder()
+                                .inheritance(com.commercetools.history.models.common.AssociateRoleInheritanceMode
+                                        .findEnum("Enabled")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssociateTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssociateTest.java
index 69f7b25d570..46e4d73300e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssociateTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AssociateTest.java
@@ -3,34 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateBuilder builder) {
         Associate associate = builder.buildUnchecked();
         Assertions.assertThat(associate).isInstanceOf(Associate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { Associate.builder()
-                        .associateRoleAssignments(Collections.singletonList(
-                            new com.commercetools.history.models.common.AssociateRoleAssignmentImpl())) },
-                new Object[] {
+                new Object[] { "associateRoleAssignments",
+                        Associate.builder()
+                                .associateRoleAssignments(Collections.singletonList(
+                                    new com.commercetools.history.models.common.AssociateRoleAssignmentImpl())) },
+                new Object[] { "customer",
                         Associate.builder().customer(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeDefinitionTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeDefinitionTest.java
index 36aae322124..c9b78ccaf43 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeDefinitionTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeDefinitionTest.java
@@ -1,44 +1,40 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeDefinitionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeDefinitionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeDefinitionBuilder builder) {
         AttributeDefinition attributeDefinition = builder.buildUnchecked();
         Assertions.assertThat(attributeDefinition).isInstanceOf(AttributeDefinition.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { AttributeDefinition.builder()
-                        .type(new com.commercetools.history.models.common.AttributeTypeImpl()) },
-                new Object[] { AttributeDefinition.builder().name("name") },
-                new Object[] { AttributeDefinition.builder()
-                        .label(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { AttributeDefinition.builder().isRequired(true) },
-                new Object[] { AttributeDefinition.builder()
-                        .attributeConstraint(
-                            com.commercetools.history.models.common.AttributeConstraintEnum.findEnum("None")) },
-                new Object[] { AttributeDefinition.builder()
-                        .inputTip(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { AttributeDefinition.builder()
+                new Object[] { "type",
+                        AttributeDefinition.builder()
+                                .type(new com.commercetools.history.models.common.AttributeTypeImpl()) },
+                new Object[] { "name", AttributeDefinition.builder().name("name") },
+                new Object[] { "label",
+                        AttributeDefinition.builder()
+                                .label(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "isRequired", AttributeDefinition.builder().isRequired(true) },
+                new Object[] { "attributeConstraint",
+                        AttributeDefinition.builder()
+                                .attributeConstraint(
+                                    com.commercetools.history.models.common.AttributeConstraintEnum.findEnum("None")) },
+                new Object[] { "inputTip",
+                        AttributeDefinition.builder()
+                                .inputTip(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "inputHint", AttributeDefinition.builder()
                         .inputHint(com.commercetools.history.models.common.TextInputHint.findEnum("SingleLine")) },
-                new Object[] { AttributeDefinition.builder().isSearchable(true) } };
+                new Object[] { "isSearchable", AttributeDefinition.builder().isSearchable(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueTest.java
index 5c588b38042..dc3f16d9e7c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeLocalizedEnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeLocalizedEnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeLocalizedEnumValueBuilder builder) {
         AttributeLocalizedEnumValue attributeLocalizedEnumValue = builder.buildUnchecked();
         Assertions.assertThat(attributeLocalizedEnumValue).isInstanceOf(AttributeLocalizedEnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeLocalizedEnumValue.builder().key("key") },
-                new Object[] { AttributeLocalizedEnumValue.builder()
+        return new Object[][] { new Object[] { "key", AttributeLocalizedEnumValue.builder().key("key") },
+                new Object[] { "label", AttributeLocalizedEnumValue.builder()
                         .label(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueTest.java
index 69db8556f9a..5d112359b9d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributePlainEnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributePlainEnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributePlainEnumValueBuilder builder) {
         AttributePlainEnumValue attributePlainEnumValue = builder.buildUnchecked();
         Assertions.assertThat(attributePlainEnumValue).isInstanceOf(AttributePlainEnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributePlainEnumValue.builder().key("key") },
-                new Object[] { AttributePlainEnumValue.builder().label("label") } };
+        return new Object[][] { new Object[] { "key", AttributePlainEnumValue.builder().key("key") },
+                new Object[] { "label", AttributePlainEnumValue.builder().label("label") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeTypeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeTypeTest.java
index 07c512ac956..089ac462a55 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeTypeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeTypeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeTypeBuilder builder) {
         AttributeType attributeType = builder.buildUnchecked();
         Assertions.assertThat(attributeType).isInstanceOf(AttributeType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeType.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", AttributeType.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/CategoryOrderHintsTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/CategoryOrderHintsTest.java
index 3379a380cc6..603581732a4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/CategoryOrderHintsTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/CategoryOrderHintsTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryOrderHintsTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/CustomFieldsTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/CustomFieldsTest.java
index e41c5f0116b..badeee85847 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/CustomFieldsTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/CustomFieldsTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldsBuilder builder) {
         CustomFields customFields = builder.buildUnchecked();
         Assertions.assertThat(customFields).isInstanceOf(CustomFields.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "type",
                         CustomFields.builder().type(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { CustomFields.builder().fields("fields") } };
+                new Object[] { "fields", CustomFields.builder().fields("fields") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/CustomLineItemTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/CustomLineItemTest.java
index 2b0557253c4..1f6cc6a777e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/CustomLineItemTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/CustomLineItemTest.java
@@ -1,40 +1,34 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomLineItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomLineItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomLineItemBuilder builder) {
         CustomLineItem customLineItem = builder.buildUnchecked();
         Assertions.assertThat(customLineItem).isInstanceOf(CustomLineItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomLineItem.builder().id("id") },
-                new Object[] { CustomLineItem.builder()
-                        .name(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", CustomLineItem.builder().id("id") },
+                new Object[] { "name",
+                        CustomLineItem.builder()
+                                .name(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "money",
                         CustomLineItem.builder().money(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { CustomLineItem.builder()
-                        .taxedPrice(new com.commercetools.history.models.common.TaxedItemPriceImpl()) },
-                new Object[] {
+                new Object[] { "taxedPrice",
+                        CustomLineItem.builder()
+                                .taxedPrice(new com.commercetools.history.models.common.TaxedItemPriceImpl()) },
+                new Object[] { "totalPrice",
                         CustomLineItem.builder().totalPrice(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { CustomLineItem.builder().slug("slug") },
-                new Object[] { CustomLineItem.builder().quantity(8) } };
+                new Object[] { "slug", CustomLineItem.builder().slug("slug") },
+                new Object[] { "quantity", CustomLineItem.builder().quantity(8) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DeliveryItemTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DeliveryItemTest.java
index 6d75fe24746..3d5ef018cc1 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DeliveryItemTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DeliveryItemTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryItemBuilder builder) {
         DeliveryItem deliveryItem = builder.buildUnchecked();
         Assertions.assertThat(deliveryItem).isInstanceOf(DeliveryItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryItem.builder().id("id") },
-                new Object[] { DeliveryItem.builder().quantity(8) } };
+        return new Object[][] { new Object[] { "id", DeliveryItem.builder().id("id") },
+                new Object[] { "quantity", DeliveryItem.builder().quantity(8) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DeliveryTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DeliveryTest.java
index 0582eae4f03..3fffc78ab47 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DeliveryTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DeliveryTest.java
@@ -3,38 +3,34 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryBuilder builder) {
         Delivery delivery = builder.buildUnchecked();
         Assertions.assertThat(delivery).isInstanceOf(Delivery.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Delivery.builder().id("id") },
-                new Object[] { Delivery.builder().createdAt("createdAt") },
-                new Object[] { Delivery.builder()
-                        .items(Collections
-                                .singletonList(new com.commercetools.history.models.common.DeliveryItemImpl())) },
-                new Object[] { Delivery.builder()
-                        .parcels(Collections.singletonList(new com.commercetools.history.models.common.ParcelImpl())) },
-                new Object[] { Delivery.builder().address(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Delivery.builder().id("id") },
+                new Object[] { "createdAt", Delivery.builder().createdAt("createdAt") },
+                new Object[] { "items",
+                        Delivery.builder()
+                                .items(Collections.singletonList(
+                                    new com.commercetools.history.models.common.DeliveryItemImpl())) },
+                new Object[] { "parcels",
+                        Delivery.builder()
+                                .parcels(Collections
+                                        .singletonList(new com.commercetools.history.models.common.ParcelImpl())) },
+                new Object[] { "address",
+                        Delivery.builder().address(new com.commercetools.history.models.common.AddressImpl()) },
+                new Object[] { "custom",
                         Delivery.builder().custom(new com.commercetools.history.models.common.CustomFieldsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountCodeInfoTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountCodeInfoTest.java
index 47c6ab45bab..e4be382b9dc 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountCodeInfoTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountCodeInfoTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeInfoBuilder builder) {
         DiscountCodeInfo discountCodeInfo = builder.buildUnchecked();
         Assertions.assertThat(discountCodeInfo).isInstanceOf(DiscountCodeInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountCodeInfo.builder()
-                        .discountCode(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { DiscountCodeInfo.builder()
+                new Object[] { "discountCode",
+                        DiscountCodeInfo.builder()
+                                .discountCode(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "state", DiscountCodeInfo.builder()
                         .state(com.commercetools.history.models.common.DiscountCodeState.findEnum("NotActive")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountedLineItemPortionTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountedLineItemPortionTest.java
index f38c79c7cd8..af1afe64867 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountedLineItemPortionTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountedLineItemPortionTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedLineItemPortionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedLineItemPortionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedLineItemPortionBuilder builder) {
         DiscountedLineItemPortion discountedLineItemPortion = builder.buildUnchecked();
         Assertions.assertThat(discountedLineItemPortion).isInstanceOf(DiscountedLineItemPortion.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountedLineItemPortion.builder()
-                        .discount(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { DiscountedLineItemPortion.builder()
+                new Object[] { "discount",
+                        DiscountedLineItemPortion.builder()
+                                .discount(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "discountedAmount", DiscountedLineItemPortion.builder()
                         .discountedAmount(new com.commercetools.history.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountedLineItemPriceForQuantityTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountedLineItemPriceForQuantityTest.java
index 5e8ff2c482a..5bcbb6e1c22 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountedLineItemPriceForQuantityTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountedLineItemPriceForQuantityTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedLineItemPriceForQuantityTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedLineItemPriceForQuantityBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedLineItemPriceForQuantityBuilder builder) {
         DiscountedLineItemPriceForQuantity discountedLineItemPriceForQuantity = builder.buildUnchecked();
         Assertions.assertThat(discountedLineItemPriceForQuantity)
                 .isInstanceOf(DiscountedLineItemPriceForQuantity.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountedLineItemPriceForQuantity.builder().quantity(8) },
-                new Object[] { DiscountedLineItemPriceForQuantity.builder()
+        return new Object[][] { new Object[] { "quantity", DiscountedLineItemPriceForQuantity.builder().quantity(8) },
+                new Object[] { "discountedPrice", DiscountedLineItemPriceForQuantity.builder()
                         .discountedPrice(new com.commercetools.history.models.common.DiscountedLineItemPriceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountedLineItemPriceTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountedLineItemPriceTest.java
index 9b57a540ed5..86e4e92aeab 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountedLineItemPriceTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/DiscountedLineItemPriceTest.java
@@ -3,35 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedLineItemPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedLineItemPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedLineItemPriceBuilder builder) {
         DiscountedLineItemPrice discountedLineItemPrice = builder.buildUnchecked();
         Assertions.assertThat(discountedLineItemPrice).isInstanceOf(DiscountedLineItemPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountedLineItemPrice.builder()
-                        .value(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { DiscountedLineItemPrice.builder()
-                        .includedDiscounts(Collections.singletonList(
-                            new com.commercetools.history.models.common.DiscountedLineItemPortionImpl())) } };
+                new Object[] { "value",
+                        DiscountedLineItemPrice.builder()
+                                .value(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "includedDiscounts",
+                        DiscountedLineItemPrice.builder()
+                                .includedDiscounts(Collections.singletonList(
+                                    new com.commercetools.history.models.common.DiscountedLineItemPortionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/FieldDefinitionTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/FieldDefinitionTest.java
index d5b7151d343..53f78b914e5 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/FieldDefinitionTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/FieldDefinitionTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class FieldDefinitionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(FieldDefinitionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, FieldDefinitionBuilder builder) {
         FieldDefinition fieldDefinition = builder.buildUnchecked();
         Assertions.assertThat(fieldDefinition).isInstanceOf(FieldDefinition.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "type",
                         FieldDefinition.builder().type(new com.commercetools.history.models.common.FieldTypeImpl()) },
-                new Object[] { FieldDefinition.builder().name("name") },
-                new Object[] { FieldDefinition.builder()
-                        .label(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { FieldDefinition.builder()
+                new Object[] { "name", FieldDefinition.builder().name("name") },
+                new Object[] { "label",
+                        FieldDefinition.builder()
+                                .label(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "inputHint", FieldDefinition.builder()
                         .inputHint(com.commercetools.history.models.common.TextInputHint.findEnum("SingleLine")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/FieldTypeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/FieldTypeTest.java
index 477f8bab7ef..a92a0e8d19d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/FieldTypeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/FieldTypeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class FieldTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(FieldTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, FieldTypeBuilder builder) {
         FieldType fieldType = builder.buildUnchecked();
         Assertions.assertThat(fieldType).isInstanceOf(FieldType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { FieldType.builder().name("name") } };
+        return new Object[][] { new Object[] { "name", FieldType.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/GeoLocationTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/GeoLocationTest.java
index 7c4bbc92b04..215bb12d1f2 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/GeoLocationTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/GeoLocationTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GeoLocationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GeoLocationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GeoLocationBuilder builder) {
         GeoLocation geoLocation = builder.buildUnchecked();
         Assertions.assertThat(geoLocation).isInstanceOf(GeoLocation.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GeoLocation.builder().type("type") },
-                new Object[] { GeoLocation.builder().coordinates(Collections.singletonList(9)) } };
+        return new Object[][] { new Object[] { "type", GeoLocation.builder().type("type") },
+                new Object[] { "coordinates", GeoLocation.builder().coordinates(Collections.singletonList(9)) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ImageDimensionsTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ImageDimensionsTest.java
index 4ac9cc83462..b675eb290ac 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ImageDimensionsTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ImageDimensionsTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImageDimensionsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImageDimensionsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImageDimensionsBuilder builder) {
         ImageDimensions imageDimensions = builder.buildUnchecked();
         Assertions.assertThat(imageDimensions).isInstanceOf(ImageDimensions.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImageDimensions.builder().w(5) },
-                new Object[] { ImageDimensions.builder().h(6) } };
+        return new Object[][] { new Object[] { "w", ImageDimensions.builder().w(5) },
+                new Object[] { "h", ImageDimensions.builder().h(6) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ImageTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ImageTest.java
index e3f6d7e04fa..5520dfb3358 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ImageTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ImageTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImageBuilder builder) {
         Image image = builder.buildUnchecked();
         Assertions.assertThat(image).isInstanceOf(Image.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Image.builder().url("url") },
-                new Object[] {
+        return new Object[][] { new Object[] { "url", Image.builder().url("url") },
+                new Object[] { "dimensions",
                         Image.builder().dimensions(new com.commercetools.history.models.common.ImageDimensionsImpl()) },
-                new Object[] { Image.builder().label("label") } };
+                new Object[] { "label", Image.builder().label("label") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/InheritedAssociateRoleAssignmentTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/InheritedAssociateRoleAssignmentTest.java
index 3b539297fb8..2d5a83e5f90 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/InheritedAssociateRoleAssignmentTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/InheritedAssociateRoleAssignmentTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InheritedAssociateRoleAssignmentTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InheritedAssociateRoleAssignmentBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InheritedAssociateRoleAssignmentBuilder builder) {
         InheritedAssociateRoleAssignment inheritedAssociateRoleAssignment = builder.buildUnchecked();
         Assertions.assertThat(inheritedAssociateRoleAssignment).isInstanceOf(InheritedAssociateRoleAssignment.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { InheritedAssociateRoleAssignment.builder()
-                        .associateRole(new com.commercetools.history.models.common.KeyReferenceImpl()) },
-                new Object[] { InheritedAssociateRoleAssignment.builder()
+                new Object[] { "associateRole",
+                        InheritedAssociateRoleAssignment.builder()
+                                .associateRole(new com.commercetools.history.models.common.KeyReferenceImpl()) },
+                new Object[] { "source", InheritedAssociateRoleAssignment.builder()
                         .source(new com.commercetools.history.models.common.KeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/InheritedAssociateTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/InheritedAssociateTest.java
index 9ece18c2c15..f0c92db0aef 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/InheritedAssociateTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/InheritedAssociateTest.java
@@ -3,34 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InheritedAssociateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InheritedAssociateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InheritedAssociateBuilder builder) {
         InheritedAssociate inheritedAssociate = builder.buildUnchecked();
         Assertions.assertThat(inheritedAssociate).isInstanceOf(InheritedAssociate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { InheritedAssociate.builder()
+                new Object[] { "associateRoleAssignments", InheritedAssociate.builder()
                         .associateRoleAssignments(Collections.singletonList(
                             new com.commercetools.history.models.common.InheritedAssociateRoleAssignmentImpl())) },
-                new Object[] { InheritedAssociate.builder()
+                new Object[] { "customer", InheritedAssociate.builder()
                         .customer(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ItemShippingDetailsTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ItemShippingDetailsTest.java
index f2f7c6aca70..9b57f92b7fe 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ItemShippingDetailsTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ItemShippingDetailsTest.java
@@ -3,34 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ItemShippingDetailsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ItemShippingDetailsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ItemShippingDetailsBuilder builder) {
         ItemShippingDetails itemShippingDetails = builder.buildUnchecked();
         Assertions.assertThat(itemShippingDetails).isInstanceOf(ItemShippingDetails.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ItemShippingDetails.builder()
-                        .targets(Collections
-                                .singletonList(new com.commercetools.history.models.common.ItemShippingTargetImpl())) },
-                new Object[] { ItemShippingDetails.builder().valid(true) } };
+                new Object[] { "targets",
+                        ItemShippingDetails.builder()
+                                .targets(Collections.singletonList(
+                                    new com.commercetools.history.models.common.ItemShippingTargetImpl())) },
+                new Object[] { "valid", ItemShippingDetails.builder().valid(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ItemShippingTargetTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ItemShippingTargetTest.java
index a994b02bb5a..3559740be9c 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ItemShippingTargetTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ItemShippingTargetTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ItemShippingTargetTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ItemShippingTargetBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ItemShippingTargetBuilder builder) {
         ItemShippingTarget itemShippingTarget = builder.buildUnchecked();
         Assertions.assertThat(itemShippingTarget).isInstanceOf(ItemShippingTarget.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ItemShippingTarget.builder().addressKey("addressKey") },
-                new Object[] { ItemShippingTarget.builder().quantity(8) } };
+        return new Object[][] { new Object[] { "addressKey", ItemShippingTarget.builder().addressKey("addressKey") },
+                new Object[] { "quantity", ItemShippingTarget.builder().quantity(8) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ItemStateTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ItemStateTest.java
index ec40943188e..62a4922f0b4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ItemStateTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ItemStateTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ItemStateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ItemStateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ItemStateBuilder builder) {
         ItemState itemState = builder.buildUnchecked();
         Assertions.assertThat(itemState).isInstanceOf(ItemState.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ItemState.builder().quantity(8) }, new Object[] {
+        return new Object[][] { new Object[] { "quantity", ItemState.builder().quantity(8) }, new Object[] { "state",
                 ItemState.builder().state(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/KeyReferenceTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/KeyReferenceTest.java
index 948d660cd14..2d40786a4ea 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/KeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/KeyReferenceTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class KeyReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(KeyReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, KeyReferenceBuilder builder) {
         KeyReference keyReference = builder.buildUnchecked();
         Assertions.assertThat(keyReference).isInstanceOf(KeyReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { KeyReference.builder().key("key") },
-                new Object[] { KeyReference.builder()
+        return new Object[][] { new Object[] { "key", KeyReference.builder().key("key") },
+                new Object[] { "typeId", KeyReference.builder()
                         .typeId(com.commercetools.history.models.common.ReferenceTypeId.findEnum("associate-role")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/LineItemTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/LineItemTest.java
index 8b5e3998209..9155cdf5716 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/LineItemTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/LineItemTest.java
@@ -1,43 +1,37 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LineItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LineItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LineItemBuilder builder) {
         LineItem lineItem = builder.buildUnchecked();
         Assertions.assertThat(lineItem).isInstanceOf(LineItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LineItem.builder().addedAt("addedAt") },
-                new Object[] {
+        return new Object[][] { new Object[] { "addedAt", LineItem.builder().addedAt("addedAt") },
+                new Object[] { "custom",
                         LineItem.builder().custom(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { LineItem.builder().id("id") },
-                new Object[] {
+                new Object[] { "id", LineItem.builder().id("id") },
+                new Object[] { "name",
                         LineItem.builder().name(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { LineItem.builder().productId("productId") },
-                new Object[] { LineItem.builder()
-                        .productSlug(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] {
+                new Object[] { "productId", LineItem.builder().productId("productId") },
+                new Object[] { "productSlug",
+                        LineItem.builder()
+                                .productSlug(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "productType",
                         LineItem.builder().productType(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { LineItem.builder().quantity(8) },
-                new Object[] { LineItem.builder().variant(new com.commercetools.history.models.common.VariantImpl()) },
-                new Object[] { LineItem.builder().variantId(5) } };
+                new Object[] { "quantity", LineItem.builder().quantity(8) },
+                new Object[] { "variant",
+                        LineItem.builder().variant(new com.commercetools.history.models.common.VariantImpl()) },
+                new Object[] { "variantId", LineItem.builder().variantId(5) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/LocalizedStringTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/LocalizedStringTest.java
index a29a3c04140..055413be327 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/LocalizedStringTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/LocalizedStringTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizedStringTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/LocationTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/LocationTest.java
index 45814d3eafa..9e7094eff16 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/LocationTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/LocationTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocationBuilder builder) {
         Location location = builder.buildUnchecked();
         Assertions.assertThat(location).isInstanceOf(Location.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Location.builder().country("country") },
-                new Object[] { Location.builder().state("state") } };
+        return new Object[][] { new Object[] { "country", Location.builder().country("country") },
+                new Object[] { "state", Location.builder().state("state") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/MoneyTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/MoneyTest.java
index 9fee79f011e..f32b9ec8f6f 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/MoneyTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/MoneyTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MoneyTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MoneyBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MoneyBuilder builder) {
         Money money = builder.buildUnchecked();
         Assertions.assertThat(money).isInstanceOf(Money.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Money.builder().currencyCode("currencyCode") },
-                new Object[] { Money.builder().centAmount(3) }, new Object[] { Money.builder().fractionDigits(4) },
-                new Object[] { Money.builder()
+        return new Object[][] { new Object[] { "currencyCode", Money.builder().currencyCode("currencyCode") },
+                new Object[] { "centAmount", Money.builder().centAmount(3) },
+                new Object[] { "fractionDigits", Money.builder().fractionDigits(4) },
+                new Object[] { "type", Money.builder()
                         .type(com.commercetools.history.models.common.MoneyType.findEnum("centPrecision")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ParcelMeasurementsTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ParcelMeasurementsTest.java
index 898318a6eef..2945b341ee4 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ParcelMeasurementsTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ParcelMeasurementsTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelMeasurementsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelMeasurementsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelMeasurementsBuilder builder) {
         ParcelMeasurements parcelMeasurements = builder.buildUnchecked();
         Assertions.assertThat(parcelMeasurements).isInstanceOf(ParcelMeasurements.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelMeasurements.builder().heightInMillimeter(5) },
-                new Object[] { ParcelMeasurements.builder().lengthInMillimeter(4) },
-                new Object[] { ParcelMeasurements.builder().widthInMillimeter(2) },
-                new Object[] { ParcelMeasurements.builder().weightInGram(9) } };
+        return new Object[][] {
+                new Object[] { "heightInMillimeter", ParcelMeasurements.builder().heightInMillimeter(5) },
+                new Object[] { "lengthInMillimeter", ParcelMeasurements.builder().lengthInMillimeter(4) },
+                new Object[] { "widthInMillimeter", ParcelMeasurements.builder().widthInMillimeter(2) },
+                new Object[] { "weightInGram", ParcelMeasurements.builder().weightInGram(9) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ParcelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ParcelTest.java
index 4f8248c5385..a8c2332a66a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ParcelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ParcelTest.java
@@ -3,38 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelBuilder builder) {
         Parcel parcel = builder.buildUnchecked();
         Assertions.assertThat(parcel).isInstanceOf(Parcel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Parcel.builder().id("id") },
-                new Object[] { Parcel.builder().createdAt("createdAt") },
-                new Object[] { Parcel.builder()
-                        .measurements(new com.commercetools.history.models.common.ParcelMeasurementsImpl()) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Parcel.builder().id("id") },
+                new Object[] { "createdAt", Parcel.builder().createdAt("createdAt") },
+                new Object[] { "measurements",
+                        Parcel.builder()
+                                .measurements(new com.commercetools.history.models.common.ParcelMeasurementsImpl()) },
+                new Object[] { "trackingData",
                         Parcel.builder().trackingData(new com.commercetools.history.models.common.TrackingDataImpl()) },
-                new Object[] { Parcel.builder()
-                        .items(Collections
-                                .singletonList(new com.commercetools.history.models.common.DeliveryItemImpl())) } };
+                new Object[] { "items",
+                        Parcel.builder()
+                                .items(Collections.singletonList(
+                                    new com.commercetools.history.models.common.DeliveryItemImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/PaymentInfoTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/PaymentInfoTest.java
index 64adfc0d157..881f41dac18 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/PaymentInfoTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/PaymentInfoTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentInfoBuilder builder) {
         PaymentInfo paymentInfo = builder.buildUnchecked();
         Assertions.assertThat(paymentInfo).isInstanceOf(PaymentInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentInfo.builder()
+        return new Object[][] { new Object[] { "payments", PaymentInfo.builder()
                 .payments(Collections.singletonList(new com.commercetools.history.models.common.ReferenceImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/PriceTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/PriceTest.java
index 46e687741f1..2575bb23a17 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/PriceTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/PriceTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PriceBuilder builder) {
         Price price = builder.buildUnchecked();
         Assertions.assertThat(price).isInstanceOf(Price.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Price.builder().id("id") },
-                new Object[] { Price.builder().value(new com.commercetools.history.models.common.MoneyImpl()) } };
+        return new Object[][] { new Object[] { "id", Price.builder().id("id") }, new Object[] { "value",
+                Price.builder().value(new com.commercetools.history.models.common.MoneyImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductSelectionSettingTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductSelectionSettingTest.java
index ed417cff17e..29ff4cc0c12 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductSelectionSettingTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductSelectionSettingTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductSelectionSettingTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductSelectionSettingBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductSelectionSettingBuilder builder) {
         ProductSelectionSetting productSelectionSetting = builder.buildUnchecked();
         Assertions.assertThat(productSelectionSetting).isInstanceOf(ProductSelectionSetting.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductSelectionSetting.builder()
-                        .productSelection(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { ProductSelectionSetting.builder().active(true) } };
+                new Object[] { "productSelection",
+                        ProductSelectionSetting.builder()
+                                .productSelection(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "active", ProductSelectionSetting.builder().active(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantAvailabilityTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantAvailabilityTest.java
index fd6b1fe9ff8..f5551fb863d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantAvailabilityTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantAvailabilityTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantAvailabilityTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantAvailabilityBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantAvailabilityBuilder builder) {
         ProductVariantAvailability productVariantAvailability = builder.buildUnchecked();
         Assertions.assertThat(productVariantAvailability).isInstanceOf(ProductVariantAvailability.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantAvailability.builder().isOnStock(true) },
-                new Object[] { ProductVariantAvailability.builder().restockableInDays(4) },
-                new Object[] { ProductVariantAvailability.builder().availableQuantity(3) },
-                new Object[] { ProductVariantAvailability.builder()
+        return new Object[][] { new Object[] { "isOnStock", ProductVariantAvailability.builder().isOnStock(true) },
+                new Object[] { "restockableInDays", ProductVariantAvailability.builder().restockableInDays(4) },
+                new Object[] { "availableQuantity", ProductVariantAvailability.builder().availableQuantity(3) },
+                new Object[] { "channels", ProductVariantAvailability.builder()
                         .channels(
                             new com.commercetools.history.models.common.ProductVariantChannelAvailabilityMapImpl()) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantChannelAvailabilityMapTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantChannelAvailabilityMapTest.java
index 3a038ad7e11..bfd6a9d4c32 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantChannelAvailabilityMapTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantChannelAvailabilityMapTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantChannelAvailabilityMapTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantChannelAvailabilityTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantChannelAvailabilityTest.java
index a60bb2c1536..0552c860c10 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantChannelAvailabilityTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantChannelAvailabilityTest.java
@@ -1,32 +1,26 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantChannelAvailabilityTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantChannelAvailabilityBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantChannelAvailabilityBuilder builder) {
         ProductVariantChannelAvailability productVariantChannelAvailability = builder.buildUnchecked();
         Assertions.assertThat(productVariantChannelAvailability).isInstanceOf(ProductVariantChannelAvailability.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantChannelAvailability.builder().isOnStock(true) },
-                new Object[] { ProductVariantChannelAvailability.builder().restockableInDays(4) },
-                new Object[] { ProductVariantChannelAvailability.builder().availableQuantity(3) } };
+        return new Object[][] {
+                new Object[] { "isOnStock", ProductVariantChannelAvailability.builder().isOnStock(true) },
+                new Object[] { "restockableInDays", ProductVariantChannelAvailability.builder().restockableInDays(4) },
+                new Object[] { "availableQuantity",
+                        ProductVariantChannelAvailability.builder().availableQuantity(3) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantSelectionTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantSelectionTest.java
index cf3b117fe50..56383479ea7 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantSelectionTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ProductVariantSelectionTest.java
@@ -3,34 +3,27 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantSelectionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantSelectionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantSelectionBuilder builder) {
         ProductVariantSelection productVariantSelection = builder.buildUnchecked();
         Assertions.assertThat(productVariantSelection).isInstanceOf(ProductVariantSelection.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductVariantSelection.builder()
-                        .type(com.commercetools.history.models.common.ProductVariantSelectionTypeEnum
-                                .findEnum("inclusion")) },
-                new Object[] { ProductVariantSelection.builder().skus(Collections.singletonList("skus")) } };
+                new Object[] { "type",
+                        ProductVariantSelection.builder()
+                                .type(com.commercetools.history.models.common.ProductVariantSelectionTypeEnum
+                                        .findEnum("inclusion")) },
+                new Object[] { "skus", ProductVariantSelection.builder().skus(Collections.singletonList("skus")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReferenceTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReferenceTest.java
index b946b0a6c30..7c5d56b2922 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReferenceTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReferenceBuilder builder) {
         Reference reference = builder.buildUnchecked();
         Assertions.assertThat(reference).isInstanceOf(Reference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Reference.builder().id("id") }, new Object[] { Reference.builder()
-                .typeId(com.commercetools.history.models.common.ReferenceTypeId.findEnum("associate-role")) } };
+        return new Object[][] { new Object[] { "id", Reference.builder().id("id") },
+                new Object[] { "typeId", Reference.builder()
+                        .typeId(com.commercetools.history.models.common.ReferenceTypeId.findEnum("associate-role")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReservationTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReservationTest.java
index 16db7d671a1..6ce9b93d6f6 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReservationTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReservationTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReservationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReservationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReservationBuilder builder) {
         Reservation reservation = builder.buildUnchecked();
         Assertions.assertThat(reservation).isInstanceOf(Reservation.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Reservation.builder().quantity(8) },
-                new Object[] {
+        return new Object[][] { new Object[] { "quantity", Reservation.builder().quantity(8) },
+                new Object[] { "owner",
                         Reservation.builder().owner(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { Reservation.builder().createdAt("createdAt") },
-                new Object[] { Reservation.builder().checkoutStartedAt("checkoutStartedAt") } };
+                new Object[] { "createdAt", Reservation.builder().createdAt("createdAt") },
+                new Object[] { "checkoutStartedAt", Reservation.builder().checkoutStartedAt("checkoutStartedAt") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ResourceIdentifierTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ResourceIdentifierTest.java
index fdb60d8fc0b..27e7b181c74 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ResourceIdentifierTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ResourceIdentifierTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ResourceIdentifierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ResourceIdentifierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ResourceIdentifierBuilder builder) {
         ResourceIdentifier resourceIdentifier = builder.buildUnchecked();
         Assertions.assertThat(resourceIdentifier).isInstanceOf(ResourceIdentifier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ResourceIdentifier.builder().id("id") },
-                new Object[] { ResourceIdentifier.builder().key("key") }, new Object[] { ResourceIdentifier.builder()
+        return new Object[][] { new Object[] { "id", ResourceIdentifier.builder().id("id") },
+                new Object[] { "key", ResourceIdentifier.builder().key("key") },
+                new Object[] { "typeId", ResourceIdentifier.builder()
                         .typeId(com.commercetools.history.models.common.ReferenceTypeId.findEnum("associate-role")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReturnInfoTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReturnInfoTest.java
index a58d9f2cb74..b70bba1b572 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReturnInfoTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReturnInfoTest.java
@@ -3,36 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReturnInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReturnInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReturnInfoBuilder builder) {
         ReturnInfo returnInfo = builder.buildUnchecked();
         Assertions.assertThat(returnInfo).isInstanceOf(ReturnInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "items",
                         ReturnInfo.builder()
                                 .items(Collections
                                         .singletonList(new com.commercetools.history.models.common.ReturnItemImpl())) },
-                new Object[] { ReturnInfo.builder().returnTrackingId("returnTrackingId") },
-                new Object[] { ReturnInfo.builder().returnDate("returnDate") } };
+                new Object[] { "returnTrackingId", ReturnInfo.builder().returnTrackingId("returnTrackingId") },
+                new Object[] { "returnDate", ReturnInfo.builder().returnDate("returnDate") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReturnItemTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReturnItemTest.java
index 63dace149f0..d15c6950842 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReturnItemTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReturnItemTest.java
@@ -1,41 +1,35 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReturnItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReturnItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReturnItemBuilder builder) {
         ReturnItem returnItem = builder.buildUnchecked();
         Assertions.assertThat(returnItem).isInstanceOf(ReturnItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReturnItem.builder().id("id") },
-                new Object[] { ReturnItem.builder().quantity(8) }, new Object[] { ReturnItem.builder().type("type") },
-                new Object[] { ReturnItem.builder().comment("comment") },
-                new Object[] { ReturnItem.builder()
-                        .shipmentState(
-                            com.commercetools.history.models.common.ReturnShipmentState.findEnum("Advised")) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", ReturnItem.builder().id("id") },
+                new Object[] { "quantity", ReturnItem.builder().quantity(8) },
+                new Object[] { "type", ReturnItem.builder().type("type") },
+                new Object[] { "comment", ReturnItem.builder().comment("comment") },
+                new Object[] { "shipmentState",
+                        ReturnItem.builder()
+                                .shipmentState(
+                                    com.commercetools.history.models.common.ReturnShipmentState.findEnum("Advised")) },
+                new Object[] { "paymentState",
                         ReturnItem.builder()
                                 .paymentState(com.commercetools.history.models.common.ReturnPaymentState
                                         .findEnum("NonRefundable")) },
-                new Object[] { ReturnItem.builder().lastModifiedAt("lastModifiedAt") },
-                new Object[] { ReturnItem.builder().createdAt("createdAt") } };
+                new Object[] { "lastModifiedAt", ReturnItem.builder().lastModifiedAt("lastModifiedAt") },
+                new Object[] { "createdAt", ReturnItem.builder().createdAt("createdAt") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReviewRatingStatisticsTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReviewRatingStatisticsTest.java
index 0ba8ec636db..5155326c773 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReviewRatingStatisticsTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ReviewRatingStatisticsTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewRatingStatisticsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewRatingStatisticsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewRatingStatisticsBuilder builder) {
         ReviewRatingStatistics reviewRatingStatistics = builder.buildUnchecked();
         Assertions.assertThat(reviewRatingStatistics).isInstanceOf(ReviewRatingStatistics.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewRatingStatistics.builder().averageRating(6) },
-                new Object[] { ReviewRatingStatistics.builder().highestRating(4) },
-                new Object[] { ReviewRatingStatistics.builder().lowestRating(8) },
-                new Object[] { ReviewRatingStatistics.builder().count(2) },
-                new Object[] { ReviewRatingStatistics.builder().ratingsDistribution("ratingsDistribution") } };
+        return new Object[][] { new Object[] { "averageRating", ReviewRatingStatistics.builder().averageRating(6) },
+                new Object[] { "highestRating", ReviewRatingStatistics.builder().highestRating(4) },
+                new Object[] { "lowestRating", ReviewRatingStatistics.builder().lowestRating(8) },
+                new Object[] { "count", ReviewRatingStatistics.builder().count(2) },
+                new Object[] { "ratingsDistribution",
+                        ReviewRatingStatistics.builder().ratingsDistribution("ratingsDistribution") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SearchKeywordTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SearchKeywordTest.java
index 2116eed57b5..800d311c1f9 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SearchKeywordTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SearchKeywordTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchKeywordTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchKeywordBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchKeywordBuilder builder) {
         SearchKeyword searchKeyword = builder.buildUnchecked();
         Assertions.assertThat(searchKeyword).isInstanceOf(SearchKeyword.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchKeyword.builder().text("text") },
-                new Object[] { SearchKeyword.builder()
+        return new Object[][] { new Object[] { "text", SearchKeyword.builder().text("text") },
+                new Object[] { "suggestTokenizer", SearchKeyword.builder()
                         .suggestTokenizer(new com.commercetools.history.models.common.SuggestTokenizerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SearchKeywordsTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SearchKeywordsTest.java
index 78088c441bb..26b82a41810 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SearchKeywordsTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SearchKeywordsTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchKeywordsTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ShippingRatePriceTierTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ShippingRatePriceTierTest.java
index 720c49e2b12..43e1e39f909 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ShippingRatePriceTierTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ShippingRatePriceTierTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingRatePriceTierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingRatePriceTierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingRatePriceTierBuilder builder) {
         ShippingRatePriceTier shippingRatePriceTier = builder.buildUnchecked();
         Assertions.assertThat(shippingRatePriceTier).isInstanceOf(ShippingRatePriceTier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ShippingRatePriceTier.builder()
+        return new Object[][] { new Object[] { "type", ShippingRatePriceTier.builder()
                 .type(com.commercetools.history.models.common.ShippingRateTierType.findEnum("CartValue")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ShippingRateTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ShippingRateTest.java
index 7f953e925c8..bf5292eeda9 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ShippingRateTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/ShippingRateTest.java
@@ -3,37 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingRateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingRateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingRateBuilder builder) {
         ShippingRate shippingRate = builder.buildUnchecked();
         Assertions.assertThat(shippingRate).isInstanceOf(ShippingRate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShippingRate.builder().price(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] {
+                new Object[] { "price",
+                        ShippingRate.builder().price(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "freeAbove",
                         ShippingRate.builder().freeAbove(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { ShippingRate.builder().isMatching(true) },
-                new Object[] { ShippingRate.builder()
-                        .tiers(Collections.singletonList(
-                            new com.commercetools.history.models.common.ShippingRatePriceTierImpl())) } };
+                new Object[] { "isMatching", ShippingRate.builder().isMatching(true) },
+                new Object[] { "tiers",
+                        ShippingRate.builder()
+                                .tiers(Collections.singletonList(
+                                    new com.commercetools.history.models.common.ShippingRatePriceTierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/StoreCountryTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/StoreCountryTest.java
index f83830fe14d..81c10a3ec7a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/StoreCountryTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/StoreCountryTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreCountryTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StoreCountryBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StoreCountryBuilder builder) {
         StoreCountry storeCountry = builder.buildUnchecked();
         Assertions.assertThat(storeCountry).isInstanceOf(StoreCountry.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StoreCountry.builder().code("code") } };
+        return new Object[][] { new Object[] { "code", StoreCountry.builder().code("code") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SubRateTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SubRateTest.java
index 86ec445247a..48042857669 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SubRateTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SubRateTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SubRateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SubRateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SubRateBuilder builder) {
         SubRate subRate = builder.buildUnchecked();
         Assertions.assertThat(subRate).isInstanceOf(SubRate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SubRate.builder().name("name") },
-                new Object[] { SubRate.builder().amount(3) } };
+        return new Object[][] { new Object[] { "name", SubRate.builder().name("name") },
+                new Object[] { "amount", SubRate.builder().amount(3) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SuggestTokenizerTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SuggestTokenizerTest.java
index c712f5b1435..5ec925ad3ab 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SuggestTokenizerTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SuggestTokenizerTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SuggestTokenizerTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SuggestTokenizerBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SuggestTokenizerBuilder builder) {
         SuggestTokenizer suggestTokenizer = builder.buildUnchecked();
         Assertions.assertThat(suggestTokenizer).isInstanceOf(SuggestTokenizer.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SuggestTokenizer.builder().type("type") } };
+        return new Object[][] { new Object[] { "type", SuggestTokenizer.builder().type("type") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SyncInfoTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SyncInfoTest.java
index a6649099724..cbece0cf20e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SyncInfoTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/SyncInfoTest.java
@@ -1,34 +1,26 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SyncInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SyncInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SyncInfoBuilder builder) {
         SyncInfo syncInfo = builder.buildUnchecked();
         Assertions.assertThat(syncInfo).isInstanceOf(SyncInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "channel",
                         SyncInfo.builder().channel(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { SyncInfo.builder().externalId("externalId") },
-                new Object[] { SyncInfo.builder().syncedAt("syncedAt") } };
+                new Object[] { "externalId", SyncInfo.builder().externalId("externalId") },
+                new Object[] { "syncedAt", SyncInfo.builder().syncedAt("syncedAt") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TaxRateTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TaxRateTest.java
index ae1c1268e13..e27ebb5ff56 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TaxRateTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TaxRateTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxRateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxRateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxRateBuilder builder) {
         TaxRate taxRate = builder.buildUnchecked();
         Assertions.assertThat(taxRate).isInstanceOf(TaxRate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxRate.builder().id("id") },
-                new Object[] { TaxRate.builder().name("name") }, new Object[] { TaxRate.builder().amount(3) },
-                new Object[] { TaxRate.builder().includedInPrice(true) },
-                new Object[] { TaxRate.builder().country("country") },
-                new Object[] { TaxRate.builder().state("state") },
-                new Object[] { TaxRate.builder()
+        return new Object[][] { new Object[] { "id", TaxRate.builder().id("id") },
+                new Object[] { "name", TaxRate.builder().name("name") },
+                new Object[] { "amount", TaxRate.builder().amount(3) },
+                new Object[] { "includedInPrice", TaxRate.builder().includedInPrice(true) },
+                new Object[] { "country", TaxRate.builder().country("country") },
+                new Object[] { "state", TaxRate.builder().state("state") },
+                new Object[] { "subRates", TaxRate.builder()
                         .subRates(
                             Collections.singletonList(new com.commercetools.history.models.common.SubRateImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TaxedItemPriceTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TaxedItemPriceTest.java
index ed7607e2e11..6a0e0ff2002 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TaxedItemPriceTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TaxedItemPriceTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxedItemPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxedItemPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxedItemPriceBuilder builder) {
         TaxedItemPrice taxedItemPrice = builder.buildUnchecked();
         Assertions.assertThat(taxedItemPrice).isInstanceOf(TaxedItemPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "totalNet",
                         TaxedItemPrice.builder().totalNet(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { TaxedItemPrice.builder()
+                new Object[] { "totalGross", TaxedItemPrice.builder()
                         .totalGross(new com.commercetools.history.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TaxedPriceTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TaxedPriceTest.java
index 1b023cf253a..46563a00f84 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TaxedPriceTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TaxedPriceTest.java
@@ -1,32 +1,25 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxedPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxedPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxedPriceBuilder builder) {
         TaxedPrice taxedPrice = builder.buildUnchecked();
         Assertions.assertThat(taxedPrice).isInstanceOf(TaxedPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { TaxedPrice.builder().totalNet(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] {
+                new Object[] { "totalNet",
+                        TaxedPrice.builder().totalNet(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "totalGross",
                         TaxedPrice.builder().totalGross(new com.commercetools.history.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TextLineItemTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TextLineItemTest.java
index 385557f3223..373c2aa4699 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TextLineItemTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TextLineItemTest.java
@@ -1,38 +1,32 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TextLineItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TextLineItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TextLineItemBuilder builder) {
         TextLineItem textLineItem = builder.buildUnchecked();
         Assertions.assertThat(textLineItem).isInstanceOf(TextLineItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TextLineItem.builder().addedAt("addedAt") },
-                new Object[] {
+        return new Object[][] { new Object[] { "addedAt", TextLineItem.builder().addedAt("addedAt") },
+                new Object[] { "custom",
                         TextLineItem.builder().custom(new com.commercetools.history.models.common.CustomFieldsImpl()) },
-                new Object[] { TextLineItem.builder()
-                        .description(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { TextLineItem.builder().id("id") },
-                new Object[] { TextLineItem.builder()
-                        .name(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { TextLineItem.builder().quantity(8) } };
+                new Object[] { "description",
+                        TextLineItem.builder()
+                                .description(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "id", TextLineItem.builder().id("id") },
+                new Object[] { "name",
+                        TextLineItem.builder()
+                                .name(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "quantity", TextLineItem.builder().quantity(8) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TrackingDataTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TrackingDataTest.java
index f51a7403220..77219f48d19 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TrackingDataTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TrackingDataTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TrackingDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TrackingDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TrackingDataBuilder builder) {
         TrackingData trackingData = builder.buildUnchecked();
         Assertions.assertThat(trackingData).isInstanceOf(TrackingData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TrackingData.builder().trackingId("trackingId") },
-                new Object[] { TrackingData.builder().carrier("carrier") },
-                new Object[] { TrackingData.builder().provider("provider") },
-                new Object[] { TrackingData.builder().providerTransaction("providerTransaction") },
-                new Object[] { TrackingData.builder().isReturn(true) } };
+        return new Object[][] { new Object[] { "trackingId", TrackingData.builder().trackingId("trackingId") },
+                new Object[] { "carrier", TrackingData.builder().carrier("carrier") },
+                new Object[] { "provider", TrackingData.builder().provider("provider") },
+                new Object[] { "providerTransaction",
+                        TrackingData.builder().providerTransaction("providerTransaction") },
+                new Object[] { "isReturn", TrackingData.builder().isReturn(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TransactionTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TransactionTest.java
index dcabba40192..5a2e3f4e080 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TransactionTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/TransactionTest.java
@@ -1,36 +1,31 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TransactionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TransactionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TransactionBuilder builder) {
         Transaction transaction = builder.buildUnchecked();
         Assertions.assertThat(transaction).isInstanceOf(Transaction.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Transaction.builder().id("id") },
-                new Object[] { Transaction.builder().timestamp("timestamp") },
-                new Object[] { Transaction.builder()
-                        .type(com.commercetools.history.models.common.TransactionType.findEnum("Authorization")) },
-                new Object[] { Transaction.builder().amount(new com.commercetools.history.models.common.MoneyImpl()) },
-                new Object[] { Transaction.builder().interactionId("interactionId") },
-                new Object[] { Transaction.builder()
+        return new Object[][] { new Object[] { "id", Transaction.builder().id("id") },
+                new Object[] { "timestamp", Transaction.builder().timestamp("timestamp") },
+                new Object[] { "type",
+                        Transaction.builder()
+                                .type(com.commercetools.history.models.common.TransactionType
+                                        .findEnum("Authorization")) },
+                new Object[] { "amount",
+                        Transaction.builder().amount(new com.commercetools.history.models.common.MoneyImpl()) },
+                new Object[] { "interactionId", Transaction.builder().interactionId("interactionId") },
+                new Object[] { "state", Transaction.builder()
                         .state(com.commercetools.history.models.common.TransactionState.findEnum("Initial")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/VariantTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/VariantTest.java
index eba28635ebc..7a459292d66 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/VariantTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/VariantTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.history.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class VariantTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(VariantBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, VariantBuilder builder) {
         Variant variant = builder.buildUnchecked();
         Assertions.assertThat(variant).isInstanceOf(Variant.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Variant.builder().id(2) }, new Object[] { Variant.builder().sku("sku") },
-                new Object[] { Variant.builder().key("key") } };
+        return new Object[][] { new Object[] { "id", Variant.builder().id(2) },
+                new Object[] { "sku", Variant.builder().sku("sku") },
+                new Object[] { "key", Variant.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLErrorLocationTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLErrorLocationTest.java
index 17714e56dbb..ffdfa65f8b2 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLErrorLocationTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLErrorLocationTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.graph_ql;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLErrorLocationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLErrorLocationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLErrorLocationBuilder builder) {
         GraphQLErrorLocation graphQLErrorLocation = builder.buildUnchecked();
         Assertions.assertThat(graphQLErrorLocation).isInstanceOf(GraphQLErrorLocation.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLErrorLocation.builder().line(6L) },
-                new Object[] { GraphQLErrorLocation.builder().column(2L) } };
+        return new Object[][] { new Object[] { "line", GraphQLErrorLocation.builder().line(6L) },
+                new Object[] { "column", GraphQLErrorLocation.builder().column(2L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLErrorTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLErrorTest.java
index 89d0819912f..88d77f0172e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLErrorTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLErrorTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLErrorBuilder builder) {
         GraphQLError graphQLError = builder.buildUnchecked();
         Assertions.assertThat(graphQLError).isInstanceOf(GraphQLError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLError.builder().message("message") },
-                new Object[] { GraphQLError.builder()
-                        .locations(Collections.singletonList(
-                            new com.commercetools.history.models.graph_ql.GraphQLErrorLocationImpl())) },
-                new Object[] { GraphQLError.builder().path(Collections.singletonList("path")) },
-                new Object[] { GraphQLError.builder().extensions("extensions") } };
+        return new Object[][] { new Object[] { "message", GraphQLError.builder().message("message") },
+                new Object[] { "locations",
+                        GraphQLError.builder()
+                                .locations(Collections.singletonList(
+                                    new com.commercetools.history.models.graph_ql.GraphQLErrorLocationImpl())) },
+                new Object[] { "path", GraphQLError.builder().path(Collections.singletonList("path")) },
+                new Object[] { "extensions", GraphQLError.builder().extensions("extensions") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLRequestTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLRequestTest.java
index 565ad41dea2..1ce1f94d924 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLRequestTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLRequestTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.graph_ql;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLRequestBuilder builder) {
         GraphQLRequest graphQLRequest = builder.buildUnchecked();
         Assertions.assertThat(graphQLRequest).isInstanceOf(GraphQLRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLRequest.builder().query("query") },
-                new Object[] { GraphQLRequest.builder().operationName("operationName") },
-                new Object[] { GraphQLRequest.builder()
+        return new Object[][] { new Object[] { "query", GraphQLRequest.builder().query("query") },
+                new Object[] { "operationName", GraphQLRequest.builder().operationName("operationName") },
+                new Object[] { "variables", GraphQLRequest.builder()
                         .variables(new com.commercetools.history.models.graph_ql.GraphQLVariablesMapImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLResponseTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLResponseTest.java
index edc29ad0199..8ba09b7636e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLResponseTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLResponseTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(GraphQLResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, GraphQLResponseBuilder builder) {
         GraphQLResponse graphQLResponse = builder.buildUnchecked();
         Assertions.assertThat(graphQLResponse).isInstanceOf(GraphQLResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { GraphQLResponse.builder().data("data") },
-                new Object[] { GraphQLResponse.builder()
-                        .errors(Collections
-                                .singletonList(new com.commercetools.history.models.graph_ql.GraphQLErrorImpl())) } };
+        return new Object[][] { new Object[] { "data", GraphQLResponse.builder().data("data") },
+                new Object[] { "errors",
+                        GraphQLResponse.builder()
+                                .errors(Collections.singletonList(
+                                    new com.commercetools.history.models.graph_ql.GraphQLErrorImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLVariablesMapTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLVariablesMapTest.java
index d007b332019..2467cca6c7b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLVariablesMapTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/graph_ql/GraphQLVariablesMapTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.history.models.graph_ql;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GraphQLVariablesMapTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/AssociateRoleLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/AssociateRoleLabelTest.java
index 95ea4777557..9de2e05ecc8 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/AssociateRoleLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/AssociateRoleLabelTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssociateRoleLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssociateRoleLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssociateRoleLabelBuilder builder) {
         AssociateRoleLabel associateRoleLabel = builder.buildUnchecked();
         Assertions.assertThat(associateRoleLabel).isInstanceOf(AssociateRoleLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssociateRoleLabel.builder().key("key") },
-                new Object[] { AssociateRoleLabel.builder().name("name") } };
+        return new Object[][] { new Object[] { "key", AssociateRoleLabel.builder().key("key") },
+                new Object[] { "name", AssociateRoleLabel.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/BusinessUnitLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/BusinessUnitLabelTest.java
index a0d6c394514..0831267c353 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/BusinessUnitLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/BusinessUnitLabelTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BusinessUnitLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BusinessUnitLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BusinessUnitLabelBuilder builder) {
         BusinessUnitLabel businessUnitLabel = builder.buildUnchecked();
         Assertions.assertThat(businessUnitLabel).isInstanceOf(BusinessUnitLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BusinessUnitLabel.builder().key("key") },
-                new Object[] { BusinessUnitLabel.builder().name("name") } };
+        return new Object[][] { new Object[] { "key", BusinessUnitLabel.builder().key("key") },
+                new Object[] { "name", BusinessUnitLabel.builder().name("name") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/CustomObjectLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/CustomObjectLabelTest.java
index a4c2cd877a2..b5bd5464eb0 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/CustomObjectLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/CustomObjectLabelTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomObjectLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomObjectLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomObjectLabelBuilder builder) {
         CustomObjectLabel customObjectLabel = builder.buildUnchecked();
         Assertions.assertThat(customObjectLabel).isInstanceOf(CustomObjectLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomObjectLabel.builder().key("key") },
-                new Object[] { CustomObjectLabel.builder().container("container") } };
+        return new Object[][] { new Object[] { "key", CustomObjectLabel.builder().key("key") },
+                new Object[] { "container", CustomObjectLabel.builder().container("container") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/CustomerLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/CustomerLabelTest.java
index cdb9997297c..faafccc6618 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/CustomerLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/CustomerLabelTest.java
@@ -1,32 +1,24 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerLabelBuilder builder) {
         CustomerLabel customerLabel = builder.buildUnchecked();
         Assertions.assertThat(customerLabel).isInstanceOf(CustomerLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerLabel.builder().firstName("firstName") },
-                new Object[] { CustomerLabel.builder().lastName("lastName") },
-                new Object[] { CustomerLabel.builder().customerNumber("customerNumber") } };
+        return new Object[][] { new Object[] { "firstName", CustomerLabel.builder().firstName("firstName") },
+                new Object[] { "lastName", CustomerLabel.builder().lastName("lastName") },
+                new Object[] { "customerNumber", CustomerLabel.builder().customerNumber("customerNumber") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/LocalizedLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/LocalizedLabelTest.java
index fb007a563d0..63a989b9a4b 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/LocalizedLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/LocalizedLabelTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizedLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocalizedLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocalizedLabelBuilder builder) {
         LocalizedLabel localizedLabel = builder.buildUnchecked();
         Assertions.assertThat(localizedLabel).isInstanceOf(LocalizedLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "value",
                 LocalizedLabel.builder().value(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/OrderLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/OrderLabelTest.java
index 92c7aa99893..f483e7c4f09 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/OrderLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/OrderLabelTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderLabelBuilder builder) {
         OrderLabel orderLabel = builder.buildUnchecked();
         Assertions.assertThat(orderLabel).isInstanceOf(OrderLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderLabel.builder().customerEmail("customerEmail") },
-                new Object[] { OrderLabel.builder().orderNumber("orderNumber") } };
+        return new Object[][] { new Object[] { "customerEmail", OrderLabel.builder().customerEmail("customerEmail") },
+                new Object[] { "orderNumber", OrderLabel.builder().orderNumber("orderNumber") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/PaymentLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/PaymentLabelTest.java
index bb7a5b8c8ea..024bbcc530e 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/PaymentLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/PaymentLabelTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PaymentLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PaymentLabelBuilder builder) {
         PaymentLabel paymentLabel = builder.buildUnchecked();
         Assertions.assertThat(paymentLabel).isInstanceOf(PaymentLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PaymentLabel.builder().key("key") }, new Object[] {
+        return new Object[][] { new Object[] { "key", PaymentLabel.builder().key("key") }, new Object[] {
+                "amountPlanned",
                 PaymentLabel.builder().amountPlanned(new com.commercetools.history.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/ProductLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/ProductLabelTest.java
index 76b49e4c5ae..7a23bfc4f09 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/ProductLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/ProductLabelTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductLabelBuilder builder) {
         ProductLabel productLabel = builder.buildUnchecked();
         Assertions.assertThat(productLabel).isInstanceOf(ProductLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ProductLabel.builder()
-                        .slug(new com.commercetools.history.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductLabel.builder()
+                new Object[] { "slug",
+                        ProductLabel.builder()
+                                .slug(new com.commercetools.history.models.common.LocalizedStringImpl()) },
+                new Object[] { "name", ProductLabel.builder()
                         .name(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/QuoteLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/QuoteLabelTest.java
index 5c6b06bf4b1..56af089ed7d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/QuoteLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/QuoteLabelTest.java
@@ -1,35 +1,27 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteLabelBuilder builder) {
         QuoteLabel quoteLabel = builder.buildUnchecked();
         Assertions.assertThat(quoteLabel).isInstanceOf(QuoteLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteLabel.builder().key("key") },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", QuoteLabel.builder().key("key") },
+                new Object[] { "customer",
                         QuoteLabel.builder().customer(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] {
+                new Object[] { "stagedQuote",
                         QuoteLabel.builder().stagedQuote(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { QuoteLabel.builder()
+                new Object[] { "quoteRequest", QuoteLabel.builder()
                         .quoteRequest(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/QuoteRequestLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/QuoteRequestLabelTest.java
index e5d4608a6fd..dc6f7824d98 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/QuoteRequestLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/QuoteRequestLabelTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class QuoteRequestLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(QuoteRequestLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, QuoteRequestLabelBuilder builder) {
         QuoteRequestLabel quoteRequestLabel = builder.buildUnchecked();
         Assertions.assertThat(quoteRequestLabel).isInstanceOf(QuoteRequestLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { QuoteRequestLabel.builder().key("key") }, new Object[] {
+        return new Object[][] { new Object[] { "key", QuoteRequestLabel.builder().key("key") }, new Object[] {
+                "customer",
                 QuoteRequestLabel.builder().customer(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/ReviewLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/ReviewLabelTest.java
index 03ddb27b2c0..31580a72d77 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/ReviewLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/ReviewLabelTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReviewLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReviewLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReviewLabelBuilder builder) {
         ReviewLabel reviewLabel = builder.buildUnchecked();
         Assertions.assertThat(reviewLabel).isInstanceOf(ReviewLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReviewLabel.builder().key("key") },
-                new Object[] { ReviewLabel.builder().title("title") } };
+        return new Object[][] { new Object[] { "key", ReviewLabel.builder().key("key") },
+                new Object[] { "title", ReviewLabel.builder().title("title") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/StagedQuoteLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/StagedQuoteLabelTest.java
index 05195351cde..b4be8ccc391 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/StagedQuoteLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/StagedQuoteLabelTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StagedQuoteLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StagedQuoteLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StagedQuoteLabelBuilder builder) {
         StagedQuoteLabel stagedQuoteLabel = builder.buildUnchecked();
         Assertions.assertThat(stagedQuoteLabel).isInstanceOf(StagedQuoteLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StagedQuoteLabel.builder().key("key") },
-                new Object[] { StagedQuoteLabel.builder()
-                        .customer(new com.commercetools.history.models.common.ReferenceImpl()) },
-                new Object[] { StagedQuoteLabel.builder()
+        return new Object[][] { new Object[] { "key", StagedQuoteLabel.builder().key("key") },
+                new Object[] { "customer",
+                        StagedQuoteLabel.builder()
+                                .customer(new com.commercetools.history.models.common.ReferenceImpl()) },
+                new Object[] { "quoteRequest", StagedQuoteLabel.builder()
                         .quoteRequest(new com.commercetools.history.models.common.ReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/StringLabelTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/StringLabelTest.java
index 19952f94713..b74e5903643 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/StringLabelTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/label/StringLabelTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.history.models.label;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StringLabelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StringLabelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StringLabelBuilder builder) {
         StringLabel stringLabel = builder.buildUnchecked();
         Assertions.assertThat(stringLabel).isInstanceOf(StringLabel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StringLabel.builder().value("value") } };
+        return new Object[][] { new Object[] { "value", StringLabel.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCategoriesImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCategoriesImportContainersByImportContainerKeyTest.java
index 213e34328dd..b3989d0833c 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCategoriesImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCategoriesImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCategoriesImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/categories/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .categories()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCategoriesImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCategoriesImportContainersTest.java
index f81dfb7dd6a..1a1771d40b9 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCategoriesImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCategoriesImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCategoriesImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCategoriesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCategoriesTest.java
index d9ba4f25cbe..06db3cbe093 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCategoriesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCategoriesTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCategoriesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCustomersImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCustomersImportContainersByImportContainerKeyTest.java
index e785a5a70ed..85b646cea66 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCustomersImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCustomersImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/customers/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .customers()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCustomersImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCustomersImportContainersTest.java
index 5c094e29aa9..2c694ff49f4 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCustomersImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCustomersImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCustomersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCustomersTest.java
index 815c42adf94..27803ccd658 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCustomersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyCustomersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyCustomersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyDiscountCodesImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyDiscountCodesImportContainersByImportContainerKeyTest.java
index 22c47cdbea3..ee2ec261328 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyDiscountCodesImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyDiscountCodesImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyDiscountCodesImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/discount-codes/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .discountCodes()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyDiscountCodesImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyDiscountCodesImportContainersTest.java
index 709a05b7b2f..a2470eb8e2e 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyDiscountCodesImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyDiscountCodesImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyDiscountCodesImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyDiscountCodesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyDiscountCodesTest.java
index eb15024d0ae..14f620a2ab2 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyDiscountCodesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyDiscountCodesTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyDiscountCodesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersByImportContainerKeyImportOperationsTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersByImportContainerKeyImportOperationsTest.java
index 221a8eda96c..2b8a18156bd 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersByImportContainerKeyImportOperationsTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersByImportContainerKeyImportOperationsTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyImportContainersByImportContainerKeyImportOperationsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -133,7 +126,6 @@ public static Object[][] requestWithMethodParameters() {
                         "get", "test_projectKey/import-containers/test_importContainerKey/import-operations", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersByImportContainerKeyImportSummariesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersByImportContainerKeyImportSummariesTest.java
index 0c764fa352a..5a1966726f5 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersByImportContainerKeyImportSummariesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersByImportContainerKeyImportSummariesTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyImportContainersByImportContainerKeyImportSummariesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "get", "test_projectKey/import-containers/test_importContainerKey/import-summaries", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .importContainers()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersByImportContainerKeyTest.java
index d9e45bd77ce..c3aea9eb05b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -88,7 +81,6 @@ public static Object[][] requestWithMethodParameters() {
                         "delete", "test_projectKey/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersTest.java
index 77a4f93398a..6cec4b2288a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportContainersTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
@@ -88,7 +81,6 @@ public static Object[][] requestWithMethodParameters() {
                         "get", "test_projectKey/import-containers", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {
                 new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportOperationsByIdTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportOperationsByIdTest.java
index 7410466dfb0..27b9996e9ac 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportOperationsByIdTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportOperationsByIdTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyImportOperationsByIdTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .importOperations()
@@ -70,7 +63,6 @@ public static Object[][] requestWithMethodParameters() {
                 .createHttpRequest(), "get", "test_projectKey/import-operations/test_id", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey").importOperations().withIdValue("test_id").get(), } };
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportOperationsTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportOperationsTest.java
index 75c9c24dfa8..f19406633dd 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportOperationsTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyImportOperationsTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyImportOperationsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyInventoriesImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyInventoriesImportContainersByImportContainerKeyTest.java
index 91cc5a8a104..3291856be8a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyInventoriesImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyInventoriesImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInventoriesImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/inventories/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .inventories()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyInventoriesImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyInventoriesImportContainersTest.java
index 3d2ef28a30e..7921c53c81e 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyInventoriesImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyInventoriesImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInventoriesImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyInventoriesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyInventoriesTest.java
index 8d1c24f20dd..892a989cedf 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyInventoriesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyInventoriesTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyInventoriesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrderPatchesImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrderPatchesImportContainersByImportContainerKeyTest.java
index 126ea507bc5..e4810986272 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrderPatchesImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrderPatchesImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrderPatchesImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/order-patches/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .orderPatches()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrderPatchesImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrderPatchesImportContainersTest.java
index f74426fabd4..549da403e13 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrderPatchesImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrderPatchesImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrderPatchesImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrderPatchesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrderPatchesTest.java
index 7fde9ea274b..9b2700fb691 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrderPatchesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrderPatchesTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrderPatchesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrdersImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrdersImportContainersByImportContainerKeyTest.java
index 0e034af3c43..e12c7ef483c 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrdersImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrdersImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/orders/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .orders()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrdersImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrdersImportContainersTest.java
index 4e4329b915e..37ba1a556c3 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrdersImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrdersImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrdersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrdersTest.java
index 1d91d90df1f..975ac1778b9 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrdersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyOrdersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyOrdersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyPricesImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyPricesImportContainersByImportContainerKeyTest.java
index aef65b35727..468471ed963 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyPricesImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyPricesImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyPricesImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/prices/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .prices()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyPricesImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyPricesImportContainersTest.java
index 542118aa6ae..9da23eb7e06 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyPricesImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyPricesImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyPricesImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyPricesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyPricesTest.java
index e745e16e241..d3378717ab9 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyPricesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyPricesTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyPricesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductDraftsImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductDraftsImportContainersByImportContainerKeyTest.java
index 414d25fa5f6..b818a550f6b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductDraftsImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductDraftsImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductDraftsImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/product-drafts/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .productDrafts()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductDraftsImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductDraftsImportContainersTest.java
index f479eea60b4..c01c37ba678 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductDraftsImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductDraftsImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductDraftsImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductDraftsTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductDraftsTest.java
index 53f78e4206b..847f58fe514 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductDraftsTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductDraftsTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductDraftsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductTypesImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductTypesImportContainersByImportContainerKeyTest.java
index 7995e160c24..b6e24411516 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductTypesImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductTypesImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductTypesImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/product-types/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .productTypes()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductTypesImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductTypesImportContainersTest.java
index 3c1dd25c5ee..cce34627fd0 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductTypesImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductTypesImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductTypesImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductTypesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductTypesTest.java
index a62c554cf49..413d18041d3 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductTypesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductTypesTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductTypesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantPatchesImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantPatchesImportContainersByImportContainerKeyTest.java
index 4d17b036097..9afa5b21bfd 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantPatchesImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantPatchesImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductVariantPatchesImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/product-variant-patches/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .productVariantPatches()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantPatchesImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantPatchesImportContainersTest.java
index 60be4d2d011..1b1307a7889 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantPatchesImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantPatchesImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductVariantPatchesImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantPatchesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantPatchesTest.java
index deb8c06e7c3..b13e9dead37 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantPatchesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantPatchesTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductVariantPatchesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantsImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantsImportContainersByImportContainerKeyTest.java
index 4fd0298f8e6..bf30e67ecaa 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantsImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantsImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductVariantsImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -75,7 +68,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/product-variants/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .productVariants()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantsImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantsImportContainersTest.java
index 670a174dd0c..c947bb834d2 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantsImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantsImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductVariantsImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantsTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantsTest.java
index afa48cbb61c..c4c612606ea 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantsTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductVariantsTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductVariantsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductsImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductsImportContainersByImportContainerKeyTest.java
index 6a255cd548f..463a4cff8cf 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductsImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductsImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductsImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/products/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .products()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductsImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductsImportContainersTest.java
index 92cbd1a4269..37dc7736497 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductsImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductsImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductsImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductsTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductsTest.java
index b870bbfb86d..73280ddd5e0 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductsTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyProductsTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyProductsTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyStandalonePricesImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyStandalonePricesImportContainersByImportContainerKeyTest.java
index e1fe1ea925e..6b0e82bac36 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyStandalonePricesImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyStandalonePricesImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStandalonePricesImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {
                 new Object[] {
@@ -75,7 +68,6 @@ public static Object[][] requestWithMethodParameters() {
                         "post", "test_projectKey/standalone-prices/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .standalonePrices()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyStandalonePricesImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyStandalonePricesImportContainersTest.java
index 09c55562a23..fcabad1d2b4 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyStandalonePricesImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyStandalonePricesImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStandalonePricesImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyStandalonePricesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyStandalonePricesTest.java
index e471287a71e..9905f8996cd 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyStandalonePricesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyStandalonePricesTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyStandalonePricesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTest.java
index 49a3daefd58..abb466a2e1a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTypesImportContainersByImportContainerKeyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTypesImportContainersByImportContainerKeyTest.java
index 364655e6ac3..58deb1b2c92 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTypesImportContainersByImportContainerKeyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTypesImportContainersByImportContainerKeyTest.java
@@ -5,10 +5,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
@@ -19,28 +15,26 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyTypesImportContainersByImportContainerKeyTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @TestTemplate
-    @UseDataProvider("requestWithMethodParameters")
+    @ParameterizedTest
+    @MethodSource("requestWithMethodParameters")
     public void withMethods(ApiHttpRequest request, String httpMethod, String uri) {
         Assertions.assertThat(httpMethod).isEqualTo(request.getMethod().name().toLowerCase());
         Assertions.assertThat(uri).isEqualTo(request.getUri().toString());
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -50,8 +44,8 @@ public void executeServerException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiServerException.class);
     }
 
-    @TestTemplate
-    @UseDataProvider("executeMethodParameters")
+    @ParameterizedTest
+    @MethodSource("executeMethodParameters")
     public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exception {
         Mockito.when(httpClientMock.execute(Mockito.any()))
                 .thenReturn(CompletableFuture.completedFuture(
@@ -61,7 +55,6 @@ public void executeClientException(HttpRequestCommand<?> httpRequest) throws Exc
                 .hasCauseInstanceOf(ApiClientException.class);
     }
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] { new Object[] {
                 apiRoot.withProjectKeyValue("test_projectKey")
@@ -73,7 +66,6 @@ public static Object[][] requestWithMethodParameters() {
                 "post", "test_projectKey/types/import-containers/test_importContainerKey", } };
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] { new Object[] { apiRoot.withProjectKeyValue("test_projectKey")
                 .types()
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTypesImportContainersTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTypesImportContainersTest.java
index 35453a2eb11..827f570c0af 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTypesImportContainersTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTypesImportContainersTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyTypesImportContainersTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTypesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTypesTest.java
index 41ed0987f22..084098797b8 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTypesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/client/resource/ByProjectKeyTypesTest.java
@@ -2,33 +2,25 @@
 package com.commercetools.importapi.client.resource;
 
 import com.commercetools.importapi.client.ApiRoot;
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
 
 import io.vrap.rmf.base.client.*;
 import io.vrap.rmf.base.client.ApiHttpClient;
 import io.vrap.rmf.base.client.VrapHttpClient;
 import io.vrap.rmf.base.client.utils.Generated;
 
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ByProjectKeyTypesTest {
     private final VrapHttpClient httpClientMock = Mockito.mock(VrapHttpClient.class);
     private final String projectKey = "test_projectKey";
     private final static ApiRoot apiRoot = ApiRoot.of();
     private final ApiHttpClient client = ClientBuilder.of(httpClientMock).defaultClient("").build();
 
-    @DataProvider
     public static Object[][] requestWithMethodParameters() {
         return new Object[][] {};
     }
 
-    @DataProvider
     public static Object[][] executeMethodParameters() {
         return new Object[][] {};
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/categories/CategoryImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/categories/CategoryImportTest.java
index 93e65f7ce64..789b0288ad8 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/categories/CategoryImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/categories/CategoryImportTest.java
@@ -3,49 +3,50 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryImportBuilder builder) {
         CategoryImport categoryImport = builder.buildUnchecked();
         Assertions.assertThat(categoryImport).isInstanceOf(CategoryImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategoryImport.builder().key("key") },
-                new Object[] { CategoryImport.builder()
-                        .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { CategoryImport.builder()
-                        .slug(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { CategoryImport.builder()
-                        .description(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { CategoryImport.builder()
-                        .parent(new com.commercetools.importapi.models.common.CategoryKeyReferenceImpl()) },
-                new Object[] { CategoryImport.builder().orderHint("orderHint") },
-                new Object[] { CategoryImport.builder().externalId("externalId") },
-                new Object[] { CategoryImport.builder()
-                        .metaTitle(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { CategoryImport.builder()
-                        .metaDescription(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { CategoryImport.builder()
-                        .metaKeywords(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { CategoryImport.builder()
-                        .assets(Collections.singletonList(new com.commercetools.importapi.models.common.AssetImpl())) },
-                new Object[] { CategoryImport.builder()
+        return new Object[][] { new Object[] { "key", CategoryImport.builder().key("key") },
+                new Object[] { "name",
+                        CategoryImport.builder()
+                                .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "slug",
+                        CategoryImport.builder()
+                                .slug(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
+                        CategoryImport.builder()
+                                .description(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "parent",
+                        CategoryImport.builder()
+                                .parent(new com.commercetools.importapi.models.common.CategoryKeyReferenceImpl()) },
+                new Object[] { "orderHint", CategoryImport.builder().orderHint("orderHint") },
+                new Object[] { "externalId", CategoryImport.builder().externalId("externalId") },
+                new Object[] { "metaTitle",
+                        CategoryImport.builder()
+                                .metaTitle(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        CategoryImport.builder()
+                                .metaDescription(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        CategoryImport.builder()
+                                .metaKeywords(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "assets",
+                        CategoryImport.builder()
+                                .assets(Collections
+                                        .singletonList(new com.commercetools.importapi.models.common.AssetImpl())) },
+                new Object[] { "custom", CategoryImport.builder()
                         .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AddressTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AddressTest.java
index 2e5d56066be..83e7907fde5 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AddressTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AddressTest.java
@@ -1,50 +1,47 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AddressTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AddressBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AddressBuilder builder) {
         Address address = builder.buildUnchecked();
         Assertions.assertThat(address).isInstanceOf(Address.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Address.builder().id("id") },
-                new Object[] { Address.builder().key("key") }, new Object[] { Address.builder().title("title") },
-                new Object[] { Address.builder().salutation("salutation") },
-                new Object[] { Address.builder().firstName("firstName") },
-                new Object[] { Address.builder().lastName("lastName") },
-                new Object[] { Address.builder().streetName("streetName") },
-                new Object[] { Address.builder().streetNumber("streetNumber") },
-                new Object[] { Address.builder().additionalStreetInfo("additionalStreetInfo") },
-                new Object[] { Address.builder().postalCode("postalCode") },
-                new Object[] { Address.builder().city("city") }, new Object[] { Address.builder().region("region") },
-                new Object[] { Address.builder().state("state") },
-                new Object[] { Address.builder().country("country") },
-                new Object[] { Address.builder().company("company") },
-                new Object[] { Address.builder().department("department") },
-                new Object[] { Address.builder().building("building") },
-                new Object[] { Address.builder().apartment("apartment") },
-                new Object[] { Address.builder().pOBox("pOBox") }, new Object[] { Address.builder().phone("phone") },
-                new Object[] { Address.builder().mobile("mobile") }, new Object[] { Address.builder().email("email") },
-                new Object[] { Address.builder().fax("fax") },
-                new Object[] { Address.builder().additionalAddressInfo("additionalAddressInfo") },
-                new Object[] { Address.builder().externalId("externalId") }, new Object[] {
+        return new Object[][] { new Object[] { "id", Address.builder().id("id") },
+                new Object[] { "key", Address.builder().key("key") },
+                new Object[] { "title", Address.builder().title("title") },
+                new Object[] { "salutation", Address.builder().salutation("salutation") },
+                new Object[] { "firstName", Address.builder().firstName("firstName") },
+                new Object[] { "lastName", Address.builder().lastName("lastName") },
+                new Object[] { "streetName", Address.builder().streetName("streetName") },
+                new Object[] { "streetNumber", Address.builder().streetNumber("streetNumber") },
+                new Object[] { "additionalStreetInfo", Address.builder().additionalStreetInfo("additionalStreetInfo") },
+                new Object[] { "postalCode", Address.builder().postalCode("postalCode") },
+                new Object[] { "city", Address.builder().city("city") },
+                new Object[] { "region", Address.builder().region("region") },
+                new Object[] { "state", Address.builder().state("state") },
+                new Object[] { "country", Address.builder().country("country") },
+                new Object[] { "company", Address.builder().company("company") },
+                new Object[] { "department", Address.builder().department("department") },
+                new Object[] { "building", Address.builder().building("building") },
+                new Object[] { "apartment", Address.builder().apartment("apartment") },
+                new Object[] { "pOBox", Address.builder().pOBox("pOBox") },
+                new Object[] { "phone", Address.builder().phone("phone") },
+                new Object[] { "mobile", Address.builder().mobile("mobile") },
+                new Object[] { "email", Address.builder().email("email") },
+                new Object[] { "fax", Address.builder().fax("fax") },
+                new Object[] { "additionalAddressInfo",
+                        Address.builder().additionalAddressInfo("additionalAddressInfo") },
+                new Object[] { "externalId", Address.builder().externalId("externalId") }, new Object[] { "custom",
                         Address.builder().custom(new com.commercetools.importapi.models.customfields.CustomImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AssetDimensionsTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AssetDimensionsTest.java
index 8ad36f81241..fc3928591fb 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AssetDimensionsTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AssetDimensionsTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssetDimensionsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssetDimensionsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssetDimensionsBuilder builder) {
         AssetDimensions assetDimensions = builder.buildUnchecked();
         Assertions.assertThat(assetDimensions).isInstanceOf(AssetDimensions.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssetDimensions.builder().w(5) },
-                new Object[] { AssetDimensions.builder().h(6) } };
+        return new Object[][] { new Object[] { "w", AssetDimensions.builder().w(5) },
+                new Object[] { "h", AssetDimensions.builder().h(6) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AssetSourceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AssetSourceTest.java
index 3a99578ad8e..dbd37db6640 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AssetSourceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AssetSourceTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssetSourceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssetSourceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssetSourceBuilder builder) {
         AssetSource assetSource = builder.buildUnchecked();
         Assertions.assertThat(assetSource).isInstanceOf(AssetSource.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AssetSource.builder().uri("uri") },
-                new Object[] { AssetSource.builder().key("key") },
-                new Object[] { AssetSource.builder()
-                        .dimensions(new com.commercetools.importapi.models.common.AssetDimensionsImpl()) },
-                new Object[] { AssetSource.builder().contentType("contentType") } };
+        return new Object[][] { new Object[] { "uri", AssetSource.builder().uri("uri") },
+                new Object[] { "key", AssetSource.builder().key("key") },
+                new Object[] { "dimensions",
+                        AssetSource.builder()
+                                .dimensions(new com.commercetools.importapi.models.common.AssetDimensionsImpl()) },
+                new Object[] { "contentType", AssetSource.builder().contentType("contentType") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AssetTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AssetTest.java
index 7d66d77e478..fc7e150c0bd 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AssetTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/AssetTest.java
@@ -3,38 +3,33 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AssetTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AssetBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AssetBuilder builder) {
         Asset asset = builder.buildUnchecked();
         Assertions.assertThat(asset).isInstanceOf(Asset.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Asset.builder().key("key") },
-                new Object[] { Asset.builder()
-                        .sources(Collections
-                                .singletonList(new com.commercetools.importapi.models.common.AssetSourceImpl())) },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", Asset.builder().key("key") },
+                new Object[] { "sources",
+                        Asset.builder()
+                                .sources(Collections.singletonList(
+                                    new com.commercetools.importapi.models.common.AssetSourceImpl())) },
+                new Object[] { "name",
                         Asset.builder().name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { Asset.builder()
-                        .description(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { Asset.builder().tags(Collections.singletonList("tags")) }, new Object[] {
+                new Object[] { "description",
+                        Asset.builder()
+                                .description(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "tags", Asset.builder().tags(Collections.singletonList("tags")) },
+                new Object[] { "custom",
                         Asset.builder().custom(new com.commercetools.importapi.models.customfields.CustomImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CartDiscountKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CartDiscountKeyReferenceTest.java
index 3fffc0e21b7..eb538d16e67 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CartDiscountKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CartDiscountKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartDiscountKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CartKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CartKeyReferenceTest.java
index 873a759d526..e4dceeb4848 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CartKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CartKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CategoryKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CategoryKeyReferenceTest.java
index b758763daee..c3ccb915c01 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CategoryKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CategoryKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ChannelKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ChannelKeyReferenceTest.java
index 9b6af3e5ca8..bc0ae1500e4 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ChannelKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ChannelKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ChannelKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CustomObjectKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CustomObjectKeyReferenceTest.java
index 29e2905a34b..4151227e1c9 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CustomObjectKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CustomObjectKeyReferenceTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomObjectKeyReferenceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomObjectKeyReferenceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomObjectKeyReferenceBuilder builder) {
         CustomObjectKeyReference customObjectKeyReference = builder.buildUnchecked();
         Assertions.assertThat(customObjectKeyReference).isInstanceOf(CustomObjectKeyReference.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomObjectKeyReference.builder().container("container") } };
+        return new Object[][] {
+                new Object[] { "container", CustomObjectKeyReference.builder().container("container") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CustomerGroupKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CustomerGroupKeyReferenceTest.java
index aa2f6120b2a..60f075dab50 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CustomerGroupKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CustomerGroupKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerGroupKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CustomerKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CustomerKeyReferenceTest.java
index 1a861b13b98..6047bbae6b3 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CustomerKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/CustomerKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/DiscountCodeKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/DiscountCodeKeyReferenceTest.java
index 86257e26912..f724b362d82 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/DiscountCodeKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/DiscountCodeKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/DiscountedPriceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/DiscountedPriceTest.java
index e466e4f6308..dcd37c0a3ce 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/DiscountedPriceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/DiscountedPriceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedPriceBuilder builder) {
         DiscountedPrice discountedPrice = builder.buildUnchecked();
         Assertions.assertThat(discountedPrice).isInstanceOf(DiscountedPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountedPrice.builder()
-                        .value(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
-                new Object[] { DiscountedPrice.builder()
+                new Object[] { "value",
+                        DiscountedPrice.builder()
+                                .value(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
+                new Object[] { "discount", DiscountedPrice.builder()
                         .discount(new com.commercetools.importapi.models.common.ProductDiscountKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/EnumValueTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/EnumValueTest.java
index 2d6b9892c9a..9b906ff6a41 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/EnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/EnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EnumValueBuilder builder) {
         EnumValue enumValue = builder.buildUnchecked();
         Assertions.assertThat(enumValue).isInstanceOf(EnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EnumValue.builder().key("key") },
-                new Object[] { EnumValue.builder().label("label") } };
+        return new Object[][] { new Object[] { "key", EnumValue.builder().key("key") },
+                new Object[] { "label", EnumValue.builder().label("label") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/HighPrecisionMoneyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/HighPrecisionMoneyTest.java
index 4ff50d0ae28..eaea0dc7f8d 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/HighPrecisionMoneyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/HighPrecisionMoneyTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class HighPrecisionMoneyTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(HighPrecisionMoneyBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, HighPrecisionMoneyBuilder builder) {
         HighPrecisionMoney highPrecisionMoney = builder.buildUnchecked();
         Assertions.assertThat(highPrecisionMoney).isInstanceOf(HighPrecisionMoney.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { HighPrecisionMoney.builder().preciseAmount(3L) } };
+        return new Object[][] { new Object[] { "preciseAmount", HighPrecisionMoney.builder().preciseAmount(3L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ImageTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ImageTest.java
index 1bd0933e5b6..22a766533dc 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ImageTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ImageTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImageTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImageBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImageBuilder builder) {
         Image image = builder.buildUnchecked();
         Assertions.assertThat(image).isInstanceOf(Image.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Image.builder().url("url") },
-                new Object[] { Image.builder()
-                        .dimensions(new com.commercetools.importapi.models.common.AssetDimensionsImpl()) },
-                new Object[] { Image.builder().label("label") } };
+        return new Object[][] { new Object[] { "url", Image.builder().url("url") },
+                new Object[] { "dimensions",
+                        Image.builder()
+                                .dimensions(new com.commercetools.importapi.models.common.AssetDimensionsImpl()) },
+                new Object[] { "label", Image.builder().label("label") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ImportResourceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ImportResourceTest.java
index 26a7e08f929..e25469aa661 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ImportResourceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ImportResourceTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportResourceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportResourceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportResourceBuilder builder) {
         ImportResource importResource = builder.buildUnchecked();
         Assertions.assertThat(importResource).isInstanceOf(ImportResource.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportResource.builder().key("key") } };
+        return new Object[][] { new Object[] { "key", ImportResource.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/LocalizedEnumValueTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/LocalizedEnumValueTest.java
index 03be2a2d109..f8f77f8a29d 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/LocalizedEnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/LocalizedEnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizedEnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocalizedEnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocalizedEnumValueBuilder builder) {
         LocalizedEnumValue localizedEnumValue = builder.buildUnchecked();
         Assertions.assertThat(localizedEnumValue).isInstanceOf(LocalizedEnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LocalizedEnumValue.builder().key("key") },
-                new Object[] { LocalizedEnumValue.builder()
+        return new Object[][] { new Object[] { "key", LocalizedEnumValue.builder().key("key") },
+                new Object[] { "label", LocalizedEnumValue.builder()
                         .label(new com.commercetools.importapi.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/LocalizedStringTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/LocalizedStringTest.java
index b4738fcd133..827ad785d0c 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/LocalizedStringTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/LocalizedStringTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizedStringTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/MoneyTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/MoneyTest.java
index 007cf1e6fad..2c0081e7f46 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/MoneyTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/MoneyTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MoneyTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/OrderKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/OrderKeyReferenceTest.java
index 39e771a9d2f..6b24cebe1ad 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/OrderKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/OrderKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/PaymentKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/PaymentKeyReferenceTest.java
index f6bb006bea7..ca45b725099 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/PaymentKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/PaymentKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PaymentKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/PriceKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/PriceKeyReferenceTest.java
index 3a9c9ba31e0..24e3f7461b5 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/PriceKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/PriceKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PriceKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/PriceTierTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/PriceTierTest.java
index 6fac3d84168..53ff08f8cb1 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/PriceTierTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/PriceTierTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PriceTierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PriceTierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PriceTierBuilder builder) {
         PriceTier priceTier = builder.buildUnchecked();
         Assertions.assertThat(priceTier).isInstanceOf(PriceTier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PriceTier.builder().minimumQuantity(1L) }, new Object[] {
-                PriceTier.builder().value(new com.commercetools.importapi.models.common.TypedMoneyImpl()) } };
+        return new Object[][] { new Object[] { "minimumQuantity", PriceTier.builder().minimumQuantity(1L) },
+                new Object[] { "value",
+                        PriceTier.builder().value(new com.commercetools.importapi.models.common.TypedMoneyImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductDiscountKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductDiscountKeyReferenceTest.java
index 1dc86a5b848..c3ef5d6c6e8 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductDiscountKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductDiscountKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDiscountKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductKeyReferenceTest.java
index 10518c718dc..7db4d4e1a79 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductTypeKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductTypeKeyReferenceTest.java
index 728c3c8dced..4819c67a97e 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductTypeKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductTypeKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductVariantKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductVariantKeyReferenceTest.java
index 49afb8b0e38..f358969dbcf 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductVariantKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ProductVariantKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ShippingMethodKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ShippingMethodKeyReferenceTest.java
index fd942616548..7bc4f78a6f1 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ShippingMethodKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/ShippingMethodKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingMethodKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/StateKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/StateKeyReferenceTest.java
index 7d2edc1e909..5b88d53432e 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/StateKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/StateKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StateKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/StoreKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/StoreKeyReferenceTest.java
index 7518ff38cf1..6e03c617382 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/StoreKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/StoreKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StoreKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/TaxCategoryKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/TaxCategoryKeyReferenceTest.java
index ce27088841c..01680b2dd80 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/TaxCategoryKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/TaxCategoryKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxCategoryKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/TypeKeyReferenceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/TypeKeyReferenceTest.java
index bc853d3b798..d2df026b72c 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/TypeKeyReferenceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/TypeKeyReferenceTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeKeyReferenceTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/UnresolvedReferencesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/UnresolvedReferencesTest.java
index f7110ffb496..c30465050de 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/UnresolvedReferencesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/common/UnresolvedReferencesTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.common;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class UnresolvedReferencesTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(UnresolvedReferencesBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, UnresolvedReferencesBuilder builder) {
         UnresolvedReferences unresolvedReferences = builder.buildUnchecked();
         Assertions.assertThat(unresolvedReferences).isInstanceOf(UnresolvedReferences.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { UnresolvedReferences.builder().key("key") },
-                new Object[] { UnresolvedReferences.builder()
+        return new Object[][] { new Object[] { "key", UnresolvedReferences.builder().key("key") },
+                new Object[] { "typeId", UnresolvedReferences.builder()
                         .typeId(com.commercetools.importapi.models.common.ReferenceType.findEnum("cart")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customers/CustomerAddressTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customers/CustomerAddressTest.java
index 8dfce687fef..3f9adf62ac1 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customers/CustomerAddressTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customers/CustomerAddressTest.java
@@ -1,54 +1,48 @@
 
 package com.commercetools.importapi.models.customers;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerAddressTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerAddressBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerAddressBuilder builder) {
         CustomerAddress customerAddress = builder.buildUnchecked();
         Assertions.assertThat(customerAddress).isInstanceOf(CustomerAddress.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerAddress.builder().key("key") },
-                new Object[] { CustomerAddress.builder().country("country") },
-                new Object[] { CustomerAddress.builder().title("title") },
-                new Object[] { CustomerAddress.builder().salutation("salutation") },
-                new Object[] { CustomerAddress.builder().firstName("firstName") },
-                new Object[] { CustomerAddress.builder().lastName("lastName") },
-                new Object[] { CustomerAddress.builder().streetName("streetName") },
-                new Object[] { CustomerAddress.builder().streetNumber("streetNumber") },
-                new Object[] { CustomerAddress.builder().additionalStreetInfo("additionalStreetInfo") },
-                new Object[] { CustomerAddress.builder().postalCode("postalCode") },
-                new Object[] { CustomerAddress.builder().city("city") },
-                new Object[] { CustomerAddress.builder().region("region") },
-                new Object[] { CustomerAddress.builder().state("state") },
-                new Object[] { CustomerAddress.builder().company("company") },
-                new Object[] { CustomerAddress.builder().department("department") },
-                new Object[] { CustomerAddress.builder().building("building") },
-                new Object[] { CustomerAddress.builder().apartment("apartment") },
-                new Object[] { CustomerAddress.builder().pOBox("pOBox") },
-                new Object[] { CustomerAddress.builder().phone("phone") },
-                new Object[] { CustomerAddress.builder().mobile("mobile") },
-                new Object[] { CustomerAddress.builder().email("email") },
-                new Object[] { CustomerAddress.builder().fax("fax") },
-                new Object[] { CustomerAddress.builder().additionalAddressInfo("additionalAddressInfo") },
-                new Object[] { CustomerAddress.builder().externalId("externalId") },
-                new Object[] { CustomerAddress.builder()
+        return new Object[][] { new Object[] { "key", CustomerAddress.builder().key("key") },
+                new Object[] { "country", CustomerAddress.builder().country("country") },
+                new Object[] { "title", CustomerAddress.builder().title("title") },
+                new Object[] { "salutation", CustomerAddress.builder().salutation("salutation") },
+                new Object[] { "firstName", CustomerAddress.builder().firstName("firstName") },
+                new Object[] { "lastName", CustomerAddress.builder().lastName("lastName") },
+                new Object[] { "streetName", CustomerAddress.builder().streetName("streetName") },
+                new Object[] { "streetNumber", CustomerAddress.builder().streetNumber("streetNumber") },
+                new Object[] { "additionalStreetInfo",
+                        CustomerAddress.builder().additionalStreetInfo("additionalStreetInfo") },
+                new Object[] { "postalCode", CustomerAddress.builder().postalCode("postalCode") },
+                new Object[] { "city", CustomerAddress.builder().city("city") },
+                new Object[] { "region", CustomerAddress.builder().region("region") },
+                new Object[] { "state", CustomerAddress.builder().state("state") },
+                new Object[] { "company", CustomerAddress.builder().company("company") },
+                new Object[] { "department", CustomerAddress.builder().department("department") },
+                new Object[] { "building", CustomerAddress.builder().building("building") },
+                new Object[] { "apartment", CustomerAddress.builder().apartment("apartment") },
+                new Object[] { "pOBox", CustomerAddress.builder().pOBox("pOBox") },
+                new Object[] { "phone", CustomerAddress.builder().phone("phone") },
+                new Object[] { "mobile", CustomerAddress.builder().mobile("mobile") },
+                new Object[] { "email", CustomerAddress.builder().email("email") },
+                new Object[] { "fax", CustomerAddress.builder().fax("fax") },
+                new Object[] { "additionalAddressInfo",
+                        CustomerAddress.builder().additionalAddressInfo("additionalAddressInfo") },
+                new Object[] { "externalId", CustomerAddress.builder().externalId("externalId") },
+                new Object[] { "custom", CustomerAddress.builder()
                         .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customers/CustomerImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customers/CustomerImportTest.java
index 51e6a1beb86..cf4a51f1bdd 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customers/CustomerImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customers/CustomerImportTest.java
@@ -4,59 +4,56 @@
 import java.time.LocalDate;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerImportBuilder builder) {
         CustomerImport customerImport = builder.buildUnchecked();
         Assertions.assertThat(customerImport).isInstanceOf(CustomerImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerImport.builder().key("key") },
-                new Object[] { CustomerImport.builder().customerNumber("customerNumber") },
-                new Object[] { CustomerImport.builder().email("email") },
-                new Object[] { CustomerImport.builder().password("password") },
-                new Object[] { CustomerImport.builder()
-                        .stores(Collections.singletonList(
-                            new com.commercetools.importapi.models.common.StoreKeyReferenceImpl())) },
-                new Object[] { CustomerImport.builder().firstName("firstName") },
-                new Object[] { CustomerImport.builder().lastName("lastName") },
-                new Object[] { CustomerImport.builder().middleName("middleName") },
-                new Object[] { CustomerImport.builder().title("title") },
-                new Object[] { CustomerImport.builder().salutation("salutation") },
-                new Object[] { CustomerImport.builder().externalId("externalId") },
-                new Object[] { CustomerImport.builder().dateOfBirth(LocalDate.parse("2023-06-01")) },
-                new Object[] { CustomerImport.builder().companyName("companyName") },
-                new Object[] { CustomerImport.builder().vatId("vatId") },
-                new Object[] { CustomerImport.builder().isEmailVerified(true) },
-                new Object[] { CustomerImport.builder()
+        return new Object[][] { new Object[] { "key", CustomerImport.builder().key("key") },
+                new Object[] { "customerNumber", CustomerImport.builder().customerNumber("customerNumber") },
+                new Object[] { "email", CustomerImport.builder().email("email") },
+                new Object[] { "password", CustomerImport.builder().password("password") },
+                new Object[] { "stores",
+                        CustomerImport.builder()
+                                .stores(Collections.singletonList(
+                                    new com.commercetools.importapi.models.common.StoreKeyReferenceImpl())) },
+                new Object[] { "firstName", CustomerImport.builder().firstName("firstName") },
+                new Object[] { "lastName", CustomerImport.builder().lastName("lastName") },
+                new Object[] { "middleName", CustomerImport.builder().middleName("middleName") },
+                new Object[] { "title", CustomerImport.builder().title("title") },
+                new Object[] { "salutation", CustomerImport.builder().salutation("salutation") },
+                new Object[] { "externalId", CustomerImport.builder().externalId("externalId") },
+                new Object[] { "dateOfBirth", CustomerImport.builder().dateOfBirth(LocalDate.parse("2023-06-01")) },
+                new Object[] { "companyName", CustomerImport.builder().companyName("companyName") },
+                new Object[] { "vatId", CustomerImport.builder().vatId("vatId") },
+                new Object[] { "isEmailVerified", CustomerImport.builder().isEmailVerified(true) },
+                new Object[] { "customerGroup", CustomerImport.builder()
                         .customerGroup(new com.commercetools.importapi.models.common.CustomerGroupKeyReferenceImpl()) },
-                new Object[] { CustomerImport.builder()
-                        .addresses(Collections.singletonList(
-                            new com.commercetools.importapi.models.customers.CustomerAddressImpl())) },
-                new Object[] { CustomerImport.builder().defaultBillingAddress(3) },
-                new Object[] { CustomerImport.builder().billingAddresses(Collections.singletonList(7)) },
-                new Object[] { CustomerImport.builder().defaultShippingAddress(4) },
-                new Object[] { CustomerImport.builder().shippingAddresses(Collections.singletonList(5)) },
-                new Object[] { CustomerImport.builder().locale("locale") },
-                new Object[] { CustomerImport.builder()
-                        .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) },
-                new Object[] { CustomerImport.builder()
+                new Object[] { "addresses",
+                        CustomerImport.builder()
+                                .addresses(Collections.singletonList(
+                                    new com.commercetools.importapi.models.customers.CustomerAddressImpl())) },
+                new Object[] { "defaultBillingAddress", CustomerImport.builder().defaultBillingAddress(3) },
+                new Object[] { "billingAddresses",
+                        CustomerImport.builder().billingAddresses(Collections.singletonList(7)) },
+                new Object[] { "defaultShippingAddress", CustomerImport.builder().defaultShippingAddress(4) },
+                new Object[] { "shippingAddresses",
+                        CustomerImport.builder().shippingAddresses(Collections.singletonList(5)) },
+                new Object[] { "locale", CustomerImport.builder().locale("locale") },
+                new Object[] { "custom",
+                        CustomerImport.builder()
+                                .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) },
+                new Object[] { "authenticationMode", CustomerImport.builder()
                         .authenticationMode(
                             com.commercetools.importapi.models.customers.AuthenticationMode.findEnum("Password")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/BooleanFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/BooleanFieldTest.java
index cd44e512966..7188e03dbc3 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/BooleanFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/BooleanFieldTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.customfields;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BooleanFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BooleanFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BooleanFieldBuilder builder) {
         BooleanField booleanField = builder.buildUnchecked();
         Assertions.assertThat(booleanField).isInstanceOf(BooleanField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BooleanField.builder().value(true) } };
+        return new Object[][] { new Object[] { "value", BooleanField.builder().value(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/BooleanSetFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/BooleanSetFieldTest.java
index 80192930b85..c1e90bb2355 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/BooleanSetFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/BooleanSetFieldTest.java
@@ -3,30 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BooleanSetFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BooleanSetFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BooleanSetFieldBuilder builder) {
         BooleanSetField booleanSetField = builder.buildUnchecked();
         Assertions.assertThat(booleanSetField).isInstanceOf(BooleanSetField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BooleanSetField.builder().value(Collections.singletonList(true)) } };
+        return new Object[][] {
+                new Object[] { "value", BooleanSetField.builder().value(Collections.singletonList(true)) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/CustomTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/CustomTest.java
index 230e232216f..b72ed926783 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/CustomTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/CustomTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.importapi.models.customfields;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomBuilder builder) {
         Custom custom = builder.buildUnchecked();
         Assertions.assertThat(custom).isInstanceOf(Custom.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "type",
                         Custom.builder().type(new com.commercetools.importapi.models.common.TypeKeyReferenceImpl()) },
-                new Object[] { Custom.builder()
+                new Object[] { "fields", Custom.builder()
                         .fields(new com.commercetools.importapi.models.customfields.FieldContainerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateFieldTest.java
index 46b01c67d3e..259791d61c9 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateFieldTest.java
@@ -3,30 +3,22 @@
 
 import java.time.LocalDate;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DateFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DateFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DateFieldBuilder builder) {
         DateField dateField = builder.buildUnchecked();
         Assertions.assertThat(dateField).isInstanceOf(DateField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DateField.builder().value(LocalDate.parse("2023-06-01")) } };
+        return new Object[][] { new Object[] { "value", DateField.builder().value(LocalDate.parse("2023-06-01")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateSetFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateSetFieldTest.java
index 24728bf2204..faa662e631a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateSetFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateSetFieldTest.java
@@ -4,30 +4,22 @@
 import java.time.LocalDate;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DateSetFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DateSetFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DateSetFieldBuilder builder) {
         DateSetField dateSetField = builder.buildUnchecked();
         Assertions.assertThat(dateSetField).isInstanceOf(DateSetField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "value",
                 DateSetField.builder().value(Collections.singletonList(LocalDate.parse("2023-06-01"))) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateTimeFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateTimeFieldTest.java
index 605c8c0bc24..76bafef159e 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateTimeFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateTimeFieldTest.java
@@ -3,31 +3,23 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DateTimeFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DateTimeFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DateTimeFieldBuilder builder) {
         DateTimeField dateTimeField = builder.buildUnchecked();
         Assertions.assertThat(dateTimeField).isInstanceOf(DateTimeField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DateTimeField.builder().value(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "value", DateTimeField.builder().value(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateTimeSetFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateTimeSetFieldTest.java
index a477d578fa9..6bc40339efb 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateTimeSetFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/DateTimeSetFieldTest.java
@@ -4,30 +4,22 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DateTimeSetFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DateTimeSetFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DateTimeSetFieldBuilder builder) {
         DateTimeSetField dateTimeSetField = builder.buildUnchecked();
         Assertions.assertThat(dateTimeSetField).isInstanceOf(DateTimeSetField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DateTimeSetField.builder()
+        return new Object[][] { new Object[] { "value", DateTimeSetField.builder()
                 .value(Collections.singletonList(ZonedDateTime.parse("2023-06-01T12:00Z"))) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/EnumFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/EnumFieldTest.java
index c90c837501d..aa076185942 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/EnumFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/EnumFieldTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.customfields;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EnumFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EnumFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EnumFieldBuilder builder) {
         EnumField enumField = builder.buildUnchecked();
         Assertions.assertThat(enumField).isInstanceOf(EnumField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EnumField.builder().value("value") } };
+        return new Object[][] { new Object[] { "value", EnumField.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/EnumSetFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/EnumSetFieldTest.java
index 80a7baf4074..5f0a4f428c8 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/EnumSetFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/EnumSetFieldTest.java
@@ -3,30 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EnumSetFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EnumSetFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EnumSetFieldBuilder builder) {
         EnumSetField enumSetField = builder.buildUnchecked();
         Assertions.assertThat(enumSetField).isInstanceOf(EnumSetField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EnumSetField.builder().value(Collections.singletonList("value")) } };
+        return new Object[][] {
+                new Object[] { "value", EnumSetField.builder().value(Collections.singletonList("value")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/FieldContainerTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/FieldContainerTest.java
index eade5a0e572..65339771309 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/FieldContainerTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/FieldContainerTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.customfields;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class FieldContainerTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedEnumFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedEnumFieldTest.java
index 18d3fecb26c..ec8dbd73e9d 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedEnumFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedEnumFieldTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.customfields;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizedEnumFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocalizedEnumFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocalizedEnumFieldBuilder builder) {
         LocalizedEnumField localizedEnumField = builder.buildUnchecked();
         Assertions.assertThat(localizedEnumField).isInstanceOf(LocalizedEnumField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LocalizedEnumField.builder().value("value") } };
+        return new Object[][] { new Object[] { "value", LocalizedEnumField.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedEnumSetFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedEnumSetFieldTest.java
index 6593920019f..162f27ec749 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedEnumSetFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedEnumSetFieldTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizedEnumSetFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocalizedEnumSetFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocalizedEnumSetFieldBuilder builder) {
         LocalizedEnumSetField localizedEnumSetField = builder.buildUnchecked();
         Assertions.assertThat(localizedEnumSetField).isInstanceOf(LocalizedEnumSetField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { LocalizedEnumSetField.builder().value(Collections.singletonList("value")) } };
+                new Object[] { "value", LocalizedEnumSetField.builder().value(Collections.singletonList("value")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedStringFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedStringFieldTest.java
index 1a48a954664..d53371b58b6 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedStringFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedStringFieldTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.customfields;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizedStringFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocalizedStringFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocalizedStringFieldBuilder builder) {
         LocalizedStringField localizedStringField = builder.buildUnchecked();
         Assertions.assertThat(localizedStringField).isInstanceOf(LocalizedStringField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LocalizedStringField.builder()
+        return new Object[][] { new Object[] { "value", LocalizedStringField.builder()
                 .value(new com.commercetools.importapi.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedStringSetFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedStringSetFieldTest.java
index c00b26c020a..0e4995a7567 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedStringSetFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/LocalizedStringSetFieldTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizedStringSetFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocalizedStringSetFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocalizedStringSetFieldBuilder builder) {
         LocalizedStringSetField localizedStringSetField = builder.buildUnchecked();
         Assertions.assertThat(localizedStringSetField).isInstanceOf(LocalizedStringSetField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LocalizedStringSetField.builder()
+        return new Object[][] { new Object[] { "value", LocalizedStringSetField.builder()
                 .value(
                     Collections.singletonList(new com.commercetools.importapi.models.common.LocalizedStringImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/MoneyFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/MoneyFieldTest.java
index 065311d1c93..537d15bfa36 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/MoneyFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/MoneyFieldTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.customfields;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MoneyFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MoneyFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MoneyFieldBuilder builder) {
         MoneyField moneyField = builder.buildUnchecked();
         Assertions.assertThat(moneyField).isInstanceOf(MoneyField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "value",
                 MoneyField.builder().value(new com.commercetools.importapi.models.common.TypedMoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/MoneySetFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/MoneySetFieldTest.java
index eaa2c31f57d..9517478649d 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/MoneySetFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/MoneySetFieldTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MoneySetFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MoneySetFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MoneySetFieldBuilder builder) {
         MoneySetField moneySetField = builder.buildUnchecked();
         Assertions.assertThat(moneySetField).isInstanceOf(MoneySetField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MoneySetField.builder()
+        return new Object[][] { new Object[] { "value", MoneySetField.builder()
                 .value(Collections.singletonList(new com.commercetools.importapi.models.common.MoneyImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/NumberFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/NumberFieldTest.java
index 3cc86d51ffd..5ba0222d80b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/NumberFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/NumberFieldTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.customfields;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class NumberFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(NumberFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, NumberFieldBuilder builder) {
         NumberField numberField = builder.buildUnchecked();
         Assertions.assertThat(numberField).isInstanceOf(NumberField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { NumberField.builder().value(0.8275633) } };
+        return new Object[][] { new Object[] { "value", NumberField.builder().value(0.8275633) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/NumberSetFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/NumberSetFieldTest.java
index 16f10575a1d..8e4bc4eebf6 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/NumberSetFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/NumberSetFieldTest.java
@@ -3,30 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class NumberSetFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(NumberSetFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, NumberSetFieldBuilder builder) {
         NumberSetField numberSetField = builder.buildUnchecked();
         Assertions.assertThat(numberSetField).isInstanceOf(NumberSetField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { NumberSetField.builder().value(Collections.singletonList(0.8275633)) } };
+        return new Object[][] {
+                new Object[] { "value", NumberSetField.builder().value(Collections.singletonList(0.8275633)) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/ReferenceFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/ReferenceFieldTest.java
index 63e07a161a4..c43e348d71e 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/ReferenceFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/ReferenceFieldTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.customfields;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReferenceFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReferenceFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReferenceFieldBuilder builder) {
         ReferenceField referenceField = builder.buildUnchecked();
         Assertions.assertThat(referenceField).isInstanceOf(ReferenceField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "value",
                 ReferenceField.builder().value(new com.commercetools.importapi.models.common.KeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/ReferenceSetFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/ReferenceSetFieldTest.java
index 2bc9c46826a..95ef38f7d76 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/ReferenceSetFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/ReferenceSetFieldTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReferenceSetFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReferenceSetFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReferenceSetFieldBuilder builder) {
         ReferenceSetField referenceSetField = builder.buildUnchecked();
         Assertions.assertThat(referenceSetField).isInstanceOf(ReferenceSetField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReferenceSetField.builder()
+        return new Object[][] { new Object[] { "value", ReferenceSetField.builder()
                 .value(Collections.singletonList(new com.commercetools.importapi.models.common.KeyReferenceImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/StringFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/StringFieldTest.java
index 063817eed31..18603ef790d 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/StringFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/StringFieldTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.customfields;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StringFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StringFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StringFieldBuilder builder) {
         StringField stringField = builder.buildUnchecked();
         Assertions.assertThat(stringField).isInstanceOf(StringField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StringField.builder().value("value") } };
+        return new Object[][] { new Object[] { "value", StringField.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/StringSetFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/StringSetFieldTest.java
index dc324a8d732..efdf3bd704a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/StringSetFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/StringSetFieldTest.java
@@ -3,30 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StringSetFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StringSetFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StringSetFieldBuilder builder) {
         StringSetField stringSetField = builder.buildUnchecked();
         Assertions.assertThat(stringSetField).isInstanceOf(StringSetField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StringSetField.builder().value(Collections.singletonList("value")) } };
+        return new Object[][] {
+                new Object[] { "value", StringSetField.builder().value(Collections.singletonList("value")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/TimeFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/TimeFieldTest.java
index 5e91a469384..b9512094bde 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/TimeFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/TimeFieldTest.java
@@ -3,30 +3,22 @@
 
 import java.time.LocalTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TimeFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TimeFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TimeFieldBuilder builder) {
         TimeField timeField = builder.buildUnchecked();
         Assertions.assertThat(timeField).isInstanceOf(TimeField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TimeField.builder().value(LocalTime.parse("12:00")) } };
+        return new Object[][] { new Object[] { "value", TimeField.builder().value(LocalTime.parse("12:00")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/TimeSetFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/TimeSetFieldTest.java
index 3f5d16a4fcc..9dacff05074 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/TimeSetFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/customfields/TimeSetFieldTest.java
@@ -4,31 +4,23 @@
 import java.time.LocalTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TimeSetFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TimeSetFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TimeSetFieldBuilder builder) {
         TimeSetField timeSetField = builder.buildUnchecked();
         Assertions.assertThat(timeSetField).isInstanceOf(TimeSetField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { TimeSetField.builder().value(Collections.singletonList(LocalTime.parse("12:00"))) } };
+        return new Object[][] { new Object[] { "value",
+                TimeSetField.builder().value(Collections.singletonList(LocalTime.parse("12:00"))) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/discount_codes/DiscountCodeImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/discount_codes/DiscountCodeImportTest.java
index 9cc4729b45b..f99b0c88e23 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/discount_codes/DiscountCodeImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/discount_codes/DiscountCodeImportTest.java
@@ -4,46 +4,44 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeImportBuilder builder) {
         DiscountCodeImport discountCodeImport = builder.buildUnchecked();
         Assertions.assertThat(discountCodeImport).isInstanceOf(DiscountCodeImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeImport.builder().key("key") },
-                new Object[] { DiscountCodeImport.builder()
-                        .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { DiscountCodeImport.builder()
-                        .description(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { DiscountCodeImport.builder().code("code") },
-                new Object[] { DiscountCodeImport.builder()
-                        .cartDiscounts(Collections.singletonList(
-                            new com.commercetools.importapi.models.common.CartDiscountKeyReferenceImpl())) },
-                new Object[] { DiscountCodeImport.builder().cartPredicate("cartPredicate") },
-                new Object[] { DiscountCodeImport.builder().isActive(true) },
-                new Object[] { DiscountCodeImport.builder().maxApplications(9L) },
-                new Object[] { DiscountCodeImport.builder().maxApplicationsPerCustomer(5L) },
-                new Object[] { DiscountCodeImport.builder().groups(Collections.singletonList("groups")) },
-                new Object[] { DiscountCodeImport.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { DiscountCodeImport.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { DiscountCodeImport.builder()
+        return new Object[][] { new Object[] { "key", DiscountCodeImport.builder().key("key") },
+                new Object[] { "name",
+                        DiscountCodeImport.builder()
+                                .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
+                        DiscountCodeImport.builder()
+                                .description(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "code", DiscountCodeImport.builder().code("code") },
+                new Object[] { "cartDiscounts",
+                        DiscountCodeImport.builder()
+                                .cartDiscounts(Collections.singletonList(
+                                    new com.commercetools.importapi.models.common.CartDiscountKeyReferenceImpl())) },
+                new Object[] { "cartPredicate", DiscountCodeImport.builder().cartPredicate("cartPredicate") },
+                new Object[] { "isActive", DiscountCodeImport.builder().isActive(true) },
+                new Object[] { "maxApplications", DiscountCodeImport.builder().maxApplications(9L) },
+                new Object[] { "maxApplicationsPerCustomer",
+                        DiscountCodeImport.builder().maxApplicationsPerCustomer(5L) },
+                new Object[] { "groups", DiscountCodeImport.builder().groups(Collections.singletonList("groups")) },
+                new Object[] { "validFrom",
+                        DiscountCodeImport.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        DiscountCodeImport.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "custom", DiscountCodeImport.builder()
                         .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/AccessDeniedErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/AccessDeniedErrorTest.java
index 70e48aca26f..d2b1211f7c0 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/AccessDeniedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/AccessDeniedErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AccessDeniedErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ConcurrentModificationErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ConcurrentModificationErrorTest.java
index 4c5d96ccc3c..6a6e6c66b30 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ConcurrentModificationErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ConcurrentModificationErrorTest.java
@@ -1,32 +1,26 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ConcurrentModificationErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ConcurrentModificationErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ConcurrentModificationErrorBuilder builder) {
         ConcurrentModificationError concurrentModificationError = builder.buildUnchecked();
         Assertions.assertThat(concurrentModificationError).isInstanceOf(ConcurrentModificationError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ConcurrentModificationError.builder().specifiedVersion(5L) },
-                new Object[] { ConcurrentModificationError.builder().currentVersion(4L) },
-                new Object[] { ConcurrentModificationError.builder().conflictedResource("conflictedResource") } };
+        return new Object[][] {
+                new Object[] { "specifiedVersion", ConcurrentModificationError.builder().specifiedVersion(5L) },
+                new Object[] { "currentVersion", ConcurrentModificationError.builder().currentVersion(4L) },
+                new Object[] { "conflictedResource",
+                        ConcurrentModificationError.builder().conflictedResource("conflictedResource") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ContentionErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ContentionErrorTest.java
index e6a44c6012e..7b97098d9ed 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ContentionErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ContentionErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ContentionErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateAttributeValueErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateAttributeValueErrorTest.java
index 7b68a3d9363..b504ccd4150 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateAttributeValueErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateAttributeValueErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicateAttributeValueErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicateAttributeValueErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicateAttributeValueErrorBuilder builder) {
         DuplicateAttributeValueError duplicateAttributeValueError = builder.buildUnchecked();
         Assertions.assertThat(duplicateAttributeValueError).isInstanceOf(DuplicateAttributeValueError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DuplicateAttributeValueError.builder()
+        return new Object[][] { new Object[] { "attribute", DuplicateAttributeValueError.builder()
                 .attribute(new com.commercetools.importapi.models.productvariants.AttributeImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateAttributeValuesErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateAttributeValuesErrorTest.java
index 949cae86f17..ff941270e0a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateAttributeValuesErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateAttributeValuesErrorTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicateAttributeValuesErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicateAttributeValuesErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicateAttributeValuesErrorBuilder builder) {
         DuplicateAttributeValuesError duplicateAttributeValuesError = builder.buildUnchecked();
         Assertions.assertThat(duplicateAttributeValuesError).isInstanceOf(DuplicateAttributeValuesError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DuplicateAttributeValuesError.builder()
-                .attributes(Collections
-                        .singletonList(new com.commercetools.importapi.models.productvariants.AttributeImpl())) } };
+        return new Object[][] { new Object[] { "attributes",
+                DuplicateAttributeValuesError.builder()
+                        .attributes(Collections.singletonList(
+                            new com.commercetools.importapi.models.productvariants.AttributeImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateFieldErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateFieldErrorTest.java
index 536e0cc7215..adf7292d4cb 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateFieldErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateFieldErrorTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicateFieldErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicateFieldErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicateFieldErrorBuilder builder) {
         DuplicateFieldError duplicateFieldError = builder.buildUnchecked();
         Assertions.assertThat(duplicateFieldError).isInstanceOf(DuplicateFieldError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DuplicateFieldError.builder().field("field") },
-                new Object[] { DuplicateFieldError.builder().duplicateValue("duplicateValue") } };
+        return new Object[][] { new Object[] { "field", DuplicateFieldError.builder().field("field") },
+                new Object[] { "duplicateValue", DuplicateFieldError.builder().duplicateValue("duplicateValue") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateVariantValuesErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateVariantValuesErrorTest.java
index 56d1902afbb..0557596576f 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateVariantValuesErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/DuplicateVariantValuesErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DuplicateVariantValuesErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DuplicateVariantValuesErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DuplicateVariantValuesErrorBuilder builder) {
         DuplicateVariantValuesError duplicateVariantValuesError = builder.buildUnchecked();
         Assertions.assertThat(duplicateVariantValuesError).isInstanceOf(DuplicateVariantValuesError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DuplicateVariantValuesError.builder()
+        return new Object[][] { new Object[] { "variantValues", DuplicateVariantValuesError.builder()
                 .variantValues(new com.commercetools.importapi.models.errors.VariantValuesImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ErrorResponseTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ErrorResponseTest.java
index b2664b9f7f4..3470f58df37 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ErrorResponseTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ErrorResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ErrorResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ErrorResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ErrorResponseBuilder builder) {
         ErrorResponse errorResponse = builder.buildUnchecked();
         Assertions.assertThat(errorResponse).isInstanceOf(ErrorResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ErrorResponse.builder().statusCode(8) },
-                new Object[] { ErrorResponse.builder().message("message") },
-                new Object[] { ErrorResponse.builder().error("error") },
-                new Object[] { ErrorResponse.builder().error_description("error_description") },
-                new Object[] { ErrorResponse.builder()
-                        .errors(Collections
-                                .singletonList(new com.commercetools.importapi.models.errors.ErrorObjectImpl())) } };
+        return new Object[][] { new Object[] { "statusCode", ErrorResponse.builder().statusCode(8) },
+                new Object[] { "message", ErrorResponse.builder().message("message") },
+                new Object[] { "error", ErrorResponse.builder().error("error") },
+                new Object[] { "error_description", ErrorResponse.builder().error_description("error_description") },
+                new Object[] { "errors",
+                        ErrorResponse.builder()
+                                .errors(Collections.singletonList(
+                                    new com.commercetools.importapi.models.errors.ErrorObjectImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/GenericErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/GenericErrorTest.java
index fc313444b6f..9e564c68942 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/GenericErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/GenericErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class GenericErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InsufficientScopeErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InsufficientScopeErrorTest.java
index 2420b146e4f..48c7fe4cb99 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InsufficientScopeErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InsufficientScopeErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InsufficientScopeErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidCredentialsErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidCredentialsErrorTest.java
index 76a703a5b9d..f880c43d749 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidCredentialsErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidCredentialsErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidCredentialsErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidFieldErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidFieldErrorTest.java
index b914af99705..e1bf3576382 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidFieldErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidFieldErrorTest.java
@@ -3,33 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidFieldErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InvalidFieldErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InvalidFieldErrorBuilder builder) {
         InvalidFieldError invalidFieldError = builder.buildUnchecked();
         Assertions.assertThat(invalidFieldError).isInstanceOf(InvalidFieldError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InvalidFieldError.builder().field("field") },
-                new Object[] { InvalidFieldError.builder().invalidValue("invalidValue") },
-                new Object[] { InvalidFieldError.builder().allowedValues(Collections.singletonList("allowedValues")) },
-                new Object[] { InvalidFieldError.builder().resourceIndex(4L) } };
+        return new Object[][] { new Object[] { "field", InvalidFieldError.builder().field("field") },
+                new Object[] { "invalidValue", InvalidFieldError.builder().invalidValue("invalidValue") },
+                new Object[] { "allowedValues",
+                        InvalidFieldError.builder().allowedValues(Collections.singletonList("allowedValues")) },
+                new Object[] { "resourceIndex", InvalidFieldError.builder().resourceIndex(4L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidFieldsUpdateErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidFieldsUpdateErrorTest.java
index 984e1617b03..ef1f5852a74 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidFieldsUpdateErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidFieldsUpdateErrorTest.java
@@ -3,31 +3,24 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidFieldsUpdateErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InvalidFieldsUpdateErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InvalidFieldsUpdateErrorBuilder builder) {
         InvalidFieldsUpdateError invalidFieldsUpdateError = builder.buildUnchecked();
         Assertions.assertThat(invalidFieldsUpdateError).isInstanceOf(InvalidFieldsUpdateError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InvalidFieldsUpdateError.builder().message("message") },
-                new Object[] { InvalidFieldsUpdateError.builder().fields(Collections.singletonList("fields")) } };
+        return new Object[][] { new Object[] { "message", InvalidFieldsUpdateError.builder().message("message") },
+                new Object[] { "fields",
+                        InvalidFieldsUpdateError.builder().fields(Collections.singletonList("fields")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidInputTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidInputTest.java
index 67875067cea..c9d6453dc35 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidInputTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidInputTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidInputTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidJsonInputTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidJsonInputTest.java
index 9974420fe87..aec4fc388b0 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidJsonInputTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidJsonInputTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidJsonInputTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidOperationTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidOperationTest.java
index cccf07285e1..988dec3ee7e 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidOperationTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidOperationTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidOperationTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidScopeErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidScopeErrorTest.java
index 5997546bbff..878147b7203 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidScopeErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidScopeErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidScopeErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidStateTransitionErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidStateTransitionErrorTest.java
index 52417877b69..fe34befb367 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidStateTransitionErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidStateTransitionErrorTest.java
@@ -1,32 +1,27 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidStateTransitionErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InvalidStateTransitionErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InvalidStateTransitionErrorBuilder builder) {
         InvalidStateTransitionError invalidStateTransitionError = builder.buildUnchecked();
         Assertions.assertThat(invalidStateTransitionError).isInstanceOf(InvalidStateTransitionError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InvalidStateTransitionError.builder()
-                .currentState(com.commercetools.importapi.models.common.ProcessingState.findEnum("processing")) },
-                new Object[] { InvalidStateTransitionError.builder()
+        return new Object[][] {
+                new Object[] { "currentState",
+                        InvalidStateTransitionError.builder()
+                                .currentState(
+                                    com.commercetools.importapi.models.common.ProcessingState.findEnum("processing")) },
+                new Object[] { "newState", InvalidStateTransitionError.builder()
                         .newState(com.commercetools.importapi.models.common.ProcessingState.findEnum("processing")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidTokenErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidTokenErrorTest.java
index ca521da773f..e2060b63751 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidTokenErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/InvalidTokenErrorTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InvalidTokenErrorTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/NewMasterVariantAdditionNotAllowedErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/NewMasterVariantAdditionNotAllowedErrorTest.java
index ab77ff88b5b..2d84cb4e292 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/NewMasterVariantAdditionNotAllowedErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/NewMasterVariantAdditionNotAllowedErrorTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class NewMasterVariantAdditionNotAllowedErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(NewMasterVariantAdditionNotAllowedErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, NewMasterVariantAdditionNotAllowedErrorBuilder builder) {
         NewMasterVariantAdditionNotAllowedError newMasterVariantAdditionNotAllowedError = builder.buildUnchecked();
         Assertions.assertThat(newMasterVariantAdditionNotAllowedError)
                 .isInstanceOf(NewMasterVariantAdditionNotAllowedError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { NewMasterVariantAdditionNotAllowedError.builder().message("message") } };
+        return new Object[][] {
+                new Object[] { "message", NewMasterVariantAdditionNotAllowedError.builder().message("message") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/RequiredFieldErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/RequiredFieldErrorTest.java
index ec46783f4ed..99fbc6719a7 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/RequiredFieldErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/RequiredFieldErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RequiredFieldErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RequiredFieldErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RequiredFieldErrorBuilder builder) {
         RequiredFieldError requiredFieldError = builder.buildUnchecked();
         Assertions.assertThat(requiredFieldError).isInstanceOf(RequiredFieldError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RequiredFieldError.builder().field("field") } };
+        return new Object[][] { new Object[] { "field", RequiredFieldError.builder().field("field") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceCreationErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceCreationErrorTest.java
index 99086e34c10..8528214ac23 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceCreationErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceCreationErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ResourceCreationErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ResourceCreationErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ResourceCreationErrorBuilder builder) {
         ResourceCreationError resourceCreationError = builder.buildUnchecked();
         Assertions.assertThat(resourceCreationError).isInstanceOf(ResourceCreationError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ResourceCreationError.builder().resource("resource") } };
+        return new Object[][] { new Object[] { "resource", ResourceCreationError.builder().resource("resource") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceDeletionErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceDeletionErrorTest.java
index c4cbabc95d8..4a1655ca2c5 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceDeletionErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceDeletionErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ResourceDeletionErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ResourceDeletionErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ResourceDeletionErrorBuilder builder) {
         ResourceDeletionError resourceDeletionError = builder.buildUnchecked();
         Assertions.assertThat(resourceDeletionError).isInstanceOf(ResourceDeletionError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ResourceDeletionError.builder().resource("resource") } };
+        return new Object[][] { new Object[] { "resource", ResourceDeletionError.builder().resource("resource") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceNotFoundErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceNotFoundErrorTest.java
index a84fd211bbe..ba19f1aa0da 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceNotFoundErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceNotFoundErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ResourceNotFoundErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ResourceNotFoundErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ResourceNotFoundErrorBuilder builder) {
         ResourceNotFoundError resourceNotFoundError = builder.buildUnchecked();
         Assertions.assertThat(resourceNotFoundError).isInstanceOf(ResourceNotFoundError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ResourceNotFoundError.builder().resource("resource") } };
+        return new Object[][] { new Object[] { "resource", ResourceNotFoundError.builder().resource("resource") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceUpdateErrorTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceUpdateErrorTest.java
index f468429035b..ee0ad937ca8 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceUpdateErrorTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/ResourceUpdateErrorTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.errors;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ResourceUpdateErrorTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ResourceUpdateErrorBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ResourceUpdateErrorBuilder builder) {
         ResourceUpdateError resourceUpdateError = builder.buildUnchecked();
         Assertions.assertThat(resourceUpdateError).isInstanceOf(ResourceUpdateError.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ResourceUpdateError.builder().resource("resource") } };
+        return new Object[][] { new Object[] { "resource", ResourceUpdateError.builder().resource("resource") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/VariantValuesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/VariantValuesTest.java
index 4ab640e631c..4e10dd3294b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/VariantValuesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/errors/VariantValuesTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class VariantValuesTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(VariantValuesBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, VariantValuesBuilder builder) {
         VariantValues variantValues = builder.buildUnchecked();
         Assertions.assertThat(variantValues).isInstanceOf(VariantValues.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { VariantValues.builder().sku("sku") },
-                new Object[] { VariantValues.builder()
-                        .prices(Collections
-                                .singletonList(new com.commercetools.importapi.models.prices.PriceImportImpl())) },
-                new Object[] { VariantValues.builder()
-                        .attributes(Collections.singletonList(
-                            new com.commercetools.importapi.models.productvariants.AttributeImpl())) } };
+        return new Object[][] { new Object[] { "sku", VariantValues.builder().sku("sku") },
+                new Object[] { "prices",
+                        VariantValues.builder()
+                                .prices(Collections.singletonList(
+                                    new com.commercetools.importapi.models.prices.PriceImportImpl())) },
+                new Object[] { "attributes",
+                        VariantValues.builder()
+                                .attributes(Collections.singletonList(
+                                    new com.commercetools.importapi.models.productvariants.AttributeImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerDraftTest.java
index e3b9781231c..96d04f68555 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerDraftTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.importcontainers;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportContainerDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportContainerDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportContainerDraftBuilder builder) {
         ImportContainerDraft importContainerDraft = builder.buildUnchecked();
         Assertions.assertThat(importContainerDraft).isInstanceOf(ImportContainerDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportContainerDraft.builder().key("key") },
-                new Object[] { ImportContainerDraft.builder()
+        return new Object[][] { new Object[] { "key", ImportContainerDraft.builder().key("key") },
+                new Object[] { "resourceType", ImportContainerDraft.builder()
                         .resourceType(
                             com.commercetools.importapi.models.common.ImportResourceType.findEnum("category")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerPagedResponseTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerPagedResponseTest.java
index f28b5533879..a3c4d4d9497 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerPagedResponseTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerPagedResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportContainerPagedResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportContainerPagedResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportContainerPagedResponseBuilder builder) {
         ImportContainerPagedResponse importContainerPagedResponse = builder.buildUnchecked();
         Assertions.assertThat(importContainerPagedResponse).isInstanceOf(ImportContainerPagedResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportContainerPagedResponse.builder().limit(7) },
-                new Object[] { ImportContainerPagedResponse.builder().offset(3L) },
-                new Object[] { ImportContainerPagedResponse.builder().count(2L) },
-                new Object[] { ImportContainerPagedResponse.builder().total(1L) },
-                new Object[] { ImportContainerPagedResponse.builder()
-                        .results(Collections.singletonList(
-                            new com.commercetools.importapi.models.importcontainers.ImportContainerImpl())) } };
+        return new Object[][] { new Object[] { "limit", ImportContainerPagedResponse.builder().limit(7) },
+                new Object[] { "offset", ImportContainerPagedResponse.builder().offset(3L) },
+                new Object[] { "count", ImportContainerPagedResponse.builder().count(2L) },
+                new Object[] { "total", ImportContainerPagedResponse.builder().total(1L) },
+                new Object[] { "results",
+                        ImportContainerPagedResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.importapi.models.importcontainers.ImportContainerImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerTest.java
index 2fb6fb54e18..fa04a318cae 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerTest.java
@@ -3,37 +3,31 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportContainerTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportContainerBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportContainerBuilder builder) {
         ImportContainer importContainer = builder.buildUnchecked();
         Assertions.assertThat(importContainer).isInstanceOf(ImportContainer.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportContainer.builder().key("key") },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", ImportContainer.builder().key("key") },
+                new Object[] { "resourceType",
                         ImportContainer.builder()
                                 .resourceType(com.commercetools.importapi.models.common.ImportResourceType
                                         .findEnum("category")) },
-                new Object[] { ImportContainer.builder().version(2L) },
-                new Object[] { ImportContainer.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ImportContainer.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "version", ImportContainer.builder().version(2L) },
+                new Object[] { "createdAt",
+                        ImportContainer.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        ImportContainer.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerUpdateDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerUpdateDraftTest.java
index 2b3c39e73a6..18453d3da42 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerUpdateDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importcontainers/ImportContainerUpdateDraftTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.importcontainers;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportContainerUpdateDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportContainerUpdateDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportContainerUpdateDraftBuilder builder) {
         ImportContainerUpdateDraft importContainerUpdateDraft = builder.buildUnchecked();
         Assertions.assertThat(importContainerUpdateDraft).isInstanceOf(ImportContainerUpdateDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportContainerUpdateDraft.builder().version(2L) },
-                new Object[] { ImportContainerUpdateDraft.builder()
+        return new Object[][] { new Object[] { "version", ImportContainerUpdateDraft.builder().version(2L) },
+                new Object[] { "resourceType", ImportContainerUpdateDraft.builder()
                         .resourceType(
                             com.commercetools.importapi.models.common.ImportResourceType.findEnum("category")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importoperations/ImportOperationPagedResponseTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importoperations/ImportOperationPagedResponseTest.java
index f04347edbfe..504e18735d6 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importoperations/ImportOperationPagedResponseTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importoperations/ImportOperationPagedResponseTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportOperationPagedResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportOperationPagedResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportOperationPagedResponseBuilder builder) {
         ImportOperationPagedResponse importOperationPagedResponse = builder.buildUnchecked();
         Assertions.assertThat(importOperationPagedResponse).isInstanceOf(ImportOperationPagedResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportOperationPagedResponse.builder().limit(7) },
-                new Object[] { ImportOperationPagedResponse.builder().offset(3L) },
-                new Object[] { ImportOperationPagedResponse.builder().count(2L) },
-                new Object[] { ImportOperationPagedResponse.builder().total(1L) },
-                new Object[] { ImportOperationPagedResponse.builder()
-                        .results(Collections.singletonList(
-                            new com.commercetools.importapi.models.importoperations.ImportOperationImpl())) } };
+        return new Object[][] { new Object[] { "limit", ImportOperationPagedResponse.builder().limit(7) },
+                new Object[] { "offset", ImportOperationPagedResponse.builder().offset(3L) },
+                new Object[] { "count", ImportOperationPagedResponse.builder().count(2L) },
+                new Object[] { "total", ImportOperationPagedResponse.builder().total(1L) },
+                new Object[] { "results",
+                        ImportOperationPagedResponse.builder()
+                                .results(Collections.singletonList(
+                                    new com.commercetools.importapi.models.importoperations.ImportOperationImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importoperations/ImportOperationStatusTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importoperations/ImportOperationStatusTest.java
index 8b1246a347e..16fad44c4d7 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importoperations/ImportOperationStatusTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importoperations/ImportOperationStatusTest.java
@@ -3,36 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportOperationStatusTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportOperationStatusBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportOperationStatusBuilder builder) {
         ImportOperationStatus importOperationStatus = builder.buildUnchecked();
         Assertions.assertThat(importOperationStatus).isInstanceOf(ImportOperationStatus.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportOperationStatus.builder().operationId("operationId") },
-                new Object[] { ImportOperationStatus.builder()
-                        .state(com.commercetools.importapi.models.importoperations.ImportOperationState
-                                .findEnum("processing")) },
-                new Object[] { ImportOperationStatus.builder()
-                        .errors(Collections
-                                .singletonList(new com.commercetools.importapi.models.errors.ErrorObjectImpl())) } };
+        return new Object[][] {
+                new Object[] { "operationId", ImportOperationStatus.builder().operationId("operationId") },
+                new Object[] { "state",
+                        ImportOperationStatus.builder()
+                                .state(com.commercetools.importapi.models.importoperations.ImportOperationState
+                                        .findEnum("processing")) },
+                new Object[] { "errors",
+                        ImportOperationStatus.builder()
+                                .errors(Collections.singletonList(
+                                    new com.commercetools.importapi.models.errors.ErrorObjectImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importoperations/ImportOperationTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importoperations/ImportOperationTest.java
index 1ca729f9d88..80654ffa061 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importoperations/ImportOperationTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importoperations/ImportOperationTest.java
@@ -4,45 +4,43 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportOperationTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportOperationBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportOperationBuilder builder) {
         ImportOperation importOperation = builder.buildUnchecked();
         Assertions.assertThat(importOperation).isInstanceOf(ImportOperation.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportOperation.builder().version(2L) },
-                new Object[] { ImportOperation.builder().importContainerKey("importContainerKey") },
-                new Object[] { ImportOperation.builder().resourceKey("resourceKey") },
-                new Object[] { ImportOperation.builder().id("id") },
-                new Object[] { ImportOperation.builder()
+        return new Object[][] { new Object[] { "version", ImportOperation.builder().version(2L) },
+                new Object[] { "importContainerKey",
+                        ImportOperation.builder().importContainerKey("importContainerKey") },
+                new Object[] { "resourceKey", ImportOperation.builder().resourceKey("resourceKey") },
+                new Object[] { "id", ImportOperation.builder().id("id") },
+                new Object[] { "state", ImportOperation.builder()
                         .state(com.commercetools.importapi.models.common.ProcessingState.findEnum("processing")) },
-                new Object[] { ImportOperation.builder().resourceVersion(9L) },
-                new Object[] { ImportOperation.builder()
-                        .errors(Collections
-                                .singletonList(new com.commercetools.importapi.models.errors.ErrorObjectImpl())) },
-                new Object[] { ImportOperation.builder()
-                        .unresolvedReferences(Collections.singletonList(
-                            new com.commercetools.importapi.models.common.UnresolvedReferencesImpl())) },
-                new Object[] { ImportOperation.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ImportOperation.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { ImportOperation.builder().expiresAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "resourceVersion", ImportOperation.builder().resourceVersion(9L) },
+                new Object[] { "errors",
+                        ImportOperation.builder()
+                                .errors(Collections.singletonList(
+                                    new com.commercetools.importapi.models.errors.ErrorObjectImpl())) },
+                new Object[] { "unresolvedReferences",
+                        ImportOperation.builder()
+                                .unresolvedReferences(Collections.singletonList(
+                                    new com.commercetools.importapi.models.common.UnresolvedReferencesImpl())) },
+                new Object[] { "createdAt",
+                        ImportOperation.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "lastModifiedAt",
+                        ImportOperation.builder().lastModifiedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "expiresAt",
+                        ImportOperation.builder().expiresAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/CategoryImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/CategoryImportRequestTest.java
index dff02b59e2d..5ea75effeb0 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/CategoryImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/CategoryImportRequestTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CategoryImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CategoryImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CategoryImportRequestBuilder builder) {
         CategoryImportRequest categoryImportRequest = builder.buildUnchecked();
         Assertions.assertThat(categoryImportRequest).isInstanceOf(CategoryImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CategoryImportRequest.builder()
-                .resources(Collections
-                        .singletonList(new com.commercetools.importapi.models.categories.CategoryImportImpl())) } };
+        return new Object[][] { new Object[] { "resources",
+                CategoryImportRequest.builder()
+                        .resources(Collections.singletonList(
+                            new com.commercetools.importapi.models.categories.CategoryImportImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/CustomerImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/CustomerImportRequestTest.java
index 681161d85e9..6034e848d17 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/CustomerImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/CustomerImportRequestTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomerImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomerImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomerImportRequestBuilder builder) {
         CustomerImportRequest customerImportRequest = builder.buildUnchecked();
         Assertions.assertThat(customerImportRequest).isInstanceOf(CustomerImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomerImportRequest.builder()
-                .resources(Collections
-                        .singletonList(new com.commercetools.importapi.models.customers.CustomerImportImpl())) } };
+        return new Object[][] { new Object[] { "resources",
+                CustomerImportRequest.builder()
+                        .resources(Collections.singletonList(
+                            new com.commercetools.importapi.models.customers.CustomerImportImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/DiscountCodeImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/DiscountCodeImportRequestTest.java
index f5e1516bc86..d2ae7d773ef 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/DiscountCodeImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/DiscountCodeImportRequestTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeImportRequestBuilder builder) {
         DiscountCodeImportRequest discountCodeImportRequest = builder.buildUnchecked();
         Assertions.assertThat(discountCodeImportRequest).isInstanceOf(DiscountCodeImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DiscountCodeImportRequest.builder()
-                .resources(Collections.singletonList(
-                    new com.commercetools.importapi.models.discount_codes.DiscountCodeImportImpl())) } };
+        return new Object[][] { new Object[] { "resources",
+                DiscountCodeImportRequest.builder()
+                        .resources(Collections.singletonList(
+                            new com.commercetools.importapi.models.discount_codes.DiscountCodeImportImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ImportResponseTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ImportResponseTest.java
index 1daf52d8509..194df5a3d5b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ImportResponseTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ImportResponseTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportResponseTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportResponseBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportResponseBuilder builder) {
         ImportResponse importResponse = builder.buildUnchecked();
         Assertions.assertThat(importResponse).isInstanceOf(ImportResponse.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ImportResponse.builder()
-                .operationStatus(Collections.singletonList(
-                    new com.commercetools.importapi.models.importoperations.ImportOperationStatusImpl())) } };
+        return new Object[][] { new Object[] { "operationStatus",
+                ImportResponse.builder()
+                        .operationStatus(Collections.singletonList(
+                            new com.commercetools.importapi.models.importoperations.ImportOperationStatusImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/InventoryImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/InventoryImportRequestTest.java
index 3dee467fc50..741a4cc62fe 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/InventoryImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/InventoryImportRequestTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryImportRequestBuilder builder) {
         InventoryImportRequest inventoryImportRequest = builder.buildUnchecked();
         Assertions.assertThat(inventoryImportRequest).isInstanceOf(InventoryImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryImportRequest.builder()
-                .resources(Collections
-                        .singletonList(new com.commercetools.importapi.models.inventories.InventoryImportImpl())) } };
+        return new Object[][] { new Object[] { "resources",
+                InventoryImportRequest.builder()
+                        .resources(Collections.singletonList(
+                            new com.commercetools.importapi.models.inventories.InventoryImportImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/OrderImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/OrderImportRequestTest.java
index 283d95c53b8..ea7dcee67c8 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/OrderImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/OrderImportRequestTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderImportRequestBuilder builder) {
         OrderImportRequest orderImportRequest = builder.buildUnchecked();
         Assertions.assertThat(orderImportRequest).isInstanceOf(OrderImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderImportRequest.builder()
+        return new Object[][] { new Object[] { "resources", OrderImportRequest.builder()
                 .resources(
                     Collections.singletonList(new com.commercetools.importapi.models.orders.OrderImportImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/OrderPatchImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/OrderPatchImportRequestTest.java
index 8e05c7158eb..d0901d07245 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/OrderPatchImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/OrderPatchImportRequestTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderPatchImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderPatchImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderPatchImportRequestBuilder builder) {
         OrderPatchImportRequest orderPatchImportRequest = builder.buildUnchecked();
         Assertions.assertThat(orderPatchImportRequest).isInstanceOf(OrderPatchImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderPatchImportRequest.builder()
-                .patches(Collections.singletonList(
-                    new com.commercetools.importapi.models.order_patches.OrderPatchImportImpl())) } };
+        return new Object[][] { new Object[] { "patches",
+                OrderPatchImportRequest.builder()
+                        .patches(Collections.singletonList(
+                            new com.commercetools.importapi.models.order_patches.OrderPatchImportImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/PriceImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/PriceImportRequestTest.java
index 2498e2cef03..78e7225e5a1 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/PriceImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/PriceImportRequestTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PriceImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PriceImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PriceImportRequestBuilder builder) {
         PriceImportRequest priceImportRequest = builder.buildUnchecked();
         Assertions.assertThat(priceImportRequest).isInstanceOf(PriceImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PriceImportRequest.builder()
+        return new Object[][] { new Object[] { "resources", PriceImportRequest.builder()
                 .resources(
                     Collections.singletonList(new com.commercetools.importapi.models.prices.PriceImportImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductDraftImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductDraftImportRequestTest.java
index 7929683fe6f..b530b9a9771 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductDraftImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductDraftImportRequestTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDraftImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDraftImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDraftImportRequestBuilder builder) {
         ProductDraftImportRequest productDraftImportRequest = builder.buildUnchecked();
         Assertions.assertThat(productDraftImportRequest).isInstanceOf(ProductDraftImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDraftImportRequest.builder()
-                .resources(Collections.singletonList(
-                    new com.commercetools.importapi.models.productdrafts.ProductDraftImportImpl())) } };
+        return new Object[][] { new Object[] { "resources",
+                ProductDraftImportRequest.builder()
+                        .resources(Collections.singletonList(
+                            new com.commercetools.importapi.models.productdrafts.ProductDraftImportImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductImportRequestTest.java
index 5bfb34a682b..1afa76562e4 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductImportRequestTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductImportRequestBuilder builder) {
         ProductImportRequest productImportRequest = builder.buildUnchecked();
         Assertions.assertThat(productImportRequest).isInstanceOf(ProductImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductImportRequest.builder()
+        return new Object[][] { new Object[] { "resources", ProductImportRequest.builder()
                 .resources(
                     Collections.singletonList(new com.commercetools.importapi.models.products.ProductImportImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductTypeImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductTypeImportRequestTest.java
index ac1becc46e3..843c60edd93 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductTypeImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductTypeImportRequestTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeImportRequestBuilder builder) {
         ProductTypeImportRequest productTypeImportRequest = builder.buildUnchecked();
         Assertions.assertThat(productTypeImportRequest).isInstanceOf(ProductTypeImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypeImportRequest.builder()
-                .resources(Collections.singletonList(
-                    new com.commercetools.importapi.models.producttypes.ProductTypeImportImpl())) } };
+        return new Object[][] { new Object[] { "resources",
+                ProductTypeImportRequest.builder()
+                        .resources(Collections.singletonList(
+                            new com.commercetools.importapi.models.producttypes.ProductTypeImportImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductVariantImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductVariantImportRequestTest.java
index d18ca409e46..3caff205b9a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductVariantImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductVariantImportRequestTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantImportRequestBuilder builder) {
         ProductVariantImportRequest productVariantImportRequest = builder.buildUnchecked();
         Assertions.assertThat(productVariantImportRequest).isInstanceOf(ProductVariantImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantImportRequest.builder()
-                .resources(Collections.singletonList(
-                    new com.commercetools.importapi.models.productvariants.ProductVariantImportImpl())) } };
+        return new Object[][] { new Object[] { "resources",
+                ProductVariantImportRequest.builder()
+                        .resources(Collections.singletonList(
+                            new com.commercetools.importapi.models.productvariants.ProductVariantImportImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductVariantPatchRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductVariantPatchRequestTest.java
index cb3e8a9922f..67f95f1fa95 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductVariantPatchRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/ProductVariantPatchRequestTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantPatchRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantPatchRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantPatchRequestBuilder builder) {
         ProductVariantPatchRequest productVariantPatchRequest = builder.buildUnchecked();
         Assertions.assertThat(productVariantPatchRequest).isInstanceOf(ProductVariantPatchRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantPatchRequest.builder()
-                .patches(Collections.singletonList(
-                    new com.commercetools.importapi.models.productvariants.ProductVariantPatchImpl())) } };
+        return new Object[][] { new Object[] { "patches",
+                ProductVariantPatchRequest.builder()
+                        .patches(Collections.singletonList(
+                            new com.commercetools.importapi.models.productvariants.ProductVariantPatchImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/StandalonePriceImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/StandalonePriceImportRequestTest.java
index df45fba3084..81ca12eec44 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/StandalonePriceImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/StandalonePriceImportRequestTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceImportRequestBuilder builder) {
         StandalonePriceImportRequest standalonePriceImportRequest = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceImportRequest).isInstanceOf(StandalonePriceImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceImportRequest.builder()
-                .resources(Collections.singletonList(
-                    new com.commercetools.importapi.models.standalone_prices.StandalonePriceImportImpl())) } };
+        return new Object[][] { new Object[] { "resources",
+                StandalonePriceImportRequest.builder()
+                        .resources(Collections.singletonList(
+                            new com.commercetools.importapi.models.standalone_prices.StandalonePriceImportImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/TypeImportRequestTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/TypeImportRequestTest.java
index 52d36634c8b..42eaed47dd4 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/TypeImportRequestTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importrequests/TypeImportRequestTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeImportRequestTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeImportRequestBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeImportRequestBuilder builder) {
         TypeImportRequest typeImportRequest = builder.buildUnchecked();
         Assertions.assertThat(typeImportRequest).isInstanceOf(TypeImportRequest.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeImportRequest.builder()
+        return new Object[][] { new Object[] { "resources", TypeImportRequest.builder()
                 .resources(
                     Collections.singletonList(new com.commercetools.importapi.models.types.TypeImportImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importsummaries/ImportSummaryTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importsummaries/ImportSummaryTest.java
index 1a3b6da96c9..7f06360731f 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importsummaries/ImportSummaryTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importsummaries/ImportSummaryTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.importapi.models.importsummaries;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ImportSummaryTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ImportSummaryBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ImportSummaryBuilder builder) {
         ImportSummary importSummary = builder.buildUnchecked();
         Assertions.assertThat(importSummary).isInstanceOf(ImportSummary.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ImportSummary.builder()
-                        .states(new com.commercetools.importapi.models.importsummaries.OperationStatesImpl()) },
-                new Object[] { ImportSummary.builder().total(1L) } };
+                new Object[] { "states",
+                        ImportSummary.builder()
+                                .states(new com.commercetools.importapi.models.importsummaries.OperationStatesImpl()) },
+                new Object[] { "total", ImportSummary.builder().total(1L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importsummaries/OperationStatesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importsummaries/OperationStatesTest.java
index 9e742105c86..1e756ac67cd 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importsummaries/OperationStatesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/importsummaries/OperationStatesTest.java
@@ -1,36 +1,28 @@
 
 package com.commercetools.importapi.models.importsummaries;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OperationStatesTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OperationStatesBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OperationStatesBuilder builder) {
         OperationStates operationStates = builder.buildUnchecked();
         Assertions.assertThat(operationStates).isInstanceOf(OperationStates.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OperationStates.builder().processing(4L) },
-                new Object[] { OperationStates.builder().validationFailed(8L) },
-                new Object[] { OperationStates.builder().unresolved(5L) },
-                new Object[] { OperationStates.builder().waitForMasterVariant(8L) },
-                new Object[] { OperationStates.builder().imported(1L) },
-                new Object[] { OperationStates.builder().rejected(3L) },
-                new Object[] { OperationStates.builder().canceled(5L) } };
+        return new Object[][] { new Object[] { "processing", OperationStates.builder().processing(4L) },
+                new Object[] { "validationFailed", OperationStates.builder().validationFailed(8L) },
+                new Object[] { "unresolved", OperationStates.builder().unresolved(5L) },
+                new Object[] { "waitForMasterVariant", OperationStates.builder().waitForMasterVariant(8L) },
+                new Object[] { "imported", OperationStates.builder().imported(1L) },
+                new Object[] { "rejected", OperationStates.builder().rejected(3L) },
+                new Object[] { "canceled", OperationStates.builder().canceled(5L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/inventories/InventoryImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/inventories/InventoryImportTest.java
index 111b21b0ccd..b44f6956638 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/inventories/InventoryImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/inventories/InventoryImportTest.java
@@ -3,37 +3,30 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class InventoryImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(InventoryImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, InventoryImportBuilder builder) {
         InventoryImport inventoryImport = builder.buildUnchecked();
         Assertions.assertThat(inventoryImport).isInstanceOf(InventoryImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { InventoryImport.builder().key("key") },
-                new Object[] { InventoryImport.builder().sku("sku") },
-                new Object[] { InventoryImport.builder().quantityOnStock(2L) },
-                new Object[] { InventoryImport.builder().restockableInDays(4L) },
-                new Object[] { InventoryImport.builder().expectedDelivery(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { InventoryImport.builder()
+        return new Object[][] { new Object[] { "key", InventoryImport.builder().key("key") },
+                new Object[] { "sku", InventoryImport.builder().sku("sku") },
+                new Object[] { "quantityOnStock", InventoryImport.builder().quantityOnStock(2L) },
+                new Object[] { "restockableInDays", InventoryImport.builder().restockableInDays(4L) },
+                new Object[] { "expectedDelivery",
+                        InventoryImport.builder().expectedDelivery(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "supplyChannel", InventoryImport.builder()
                         .supplyChannel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
-                new Object[] { InventoryImport.builder()
+                new Object[] { "custom", InventoryImport.builder()
                         .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryAddressDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryAddressDraftTest.java
index 4b9963bbe76..e0a0d80f0d1 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryAddressDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryAddressDraftTest.java
@@ -1,31 +1,24 @@
 
 package com.commercetools.importapi.models.order_patches;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryAddressDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryAddressDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryAddressDraftBuilder builder) {
         DeliveryAddressDraft deliveryAddressDraft = builder.buildUnchecked();
         Assertions.assertThat(deliveryAddressDraft).isInstanceOf(DeliveryAddressDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryAddressDraft.builder().deliveryId("deliveryId") }, new Object[] {
-                DeliveryAddressDraft.builder().address(new com.commercetools.importapi.models.common.AddressImpl()) } };
+        return new Object[][] { new Object[] { "deliveryId", DeliveryAddressDraft.builder().deliveryId("deliveryId") },
+                new Object[] { "address", DeliveryAddressDraft.builder()
+                        .address(new com.commercetools.importapi.models.common.AddressImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryDraftTest.java
index a6e686acabd..c0f9245f420 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryDraftTest.java
@@ -3,36 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryDraftBuilder builder) {
         DeliveryDraft deliveryDraft = builder.buildUnchecked();
         Assertions.assertThat(deliveryDraft).isInstanceOf(DeliveryDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DeliveryDraft.builder()
-                        .items(Collections
-                                .singletonList(new com.commercetools.importapi.models.orders.DeliveryItemImpl())) },
-                new Object[] {
+                new Object[] { "items",
+                        DeliveryDraft.builder()
+                                .items(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.DeliveryItemImpl())) },
+                new Object[] { "address",
                         DeliveryDraft.builder().address(new com.commercetools.importapi.models.common.AddressImpl()) },
-                new Object[] { DeliveryDraft.builder()
+                new Object[] { "parcels", DeliveryDraft.builder()
                         .parcels(Collections.singletonList(
                             new com.commercetools.importapi.models.order_patches.DeliveryParcelDraftImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryParcelDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryParcelDraftTest.java
index cb66d2bdc57..6c861f72ad3 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryParcelDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryParcelDraftTest.java
@@ -3,37 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryParcelDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryParcelDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryParcelDraftBuilder builder) {
         DeliveryParcelDraft deliveryParcelDraft = builder.buildUnchecked();
         Assertions.assertThat(deliveryParcelDraft).isInstanceOf(DeliveryParcelDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DeliveryParcelDraft.builder()
-                        .measurements(new com.commercetools.importapi.models.orders.ParcelMeasurementsImpl()) },
-                new Object[] { DeliveryParcelDraft.builder()
-                        .trackingData(new com.commercetools.importapi.models.orders.TrackingDataImpl()) },
-                new Object[] { DeliveryParcelDraft.builder()
-                        .items(Collections
-                                .singletonList(new com.commercetools.importapi.models.orders.DeliveryItemImpl())) } };
+                new Object[] { "measurements",
+                        DeliveryParcelDraft.builder()
+                                .measurements(new com.commercetools.importapi.models.orders.ParcelMeasurementsImpl()) },
+                new Object[] { "trackingData",
+                        DeliveryParcelDraft.builder()
+                                .trackingData(new com.commercetools.importapi.models.orders.TrackingDataImpl()) },
+                new Object[] { "items",
+                        DeliveryParcelDraft.builder()
+                                .items(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.DeliveryItemImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryParcelTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryParcelTest.java
index 292a8fcbaf5..ca9c6ebb55b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryParcelTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/DeliveryParcelTest.java
@@ -3,37 +3,32 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryParcelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryParcelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryParcelBuilder builder) {
         DeliveryParcel deliveryParcel = builder.buildUnchecked();
         Assertions.assertThat(deliveryParcel).isInstanceOf(DeliveryParcel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryParcel.builder().deliveryId("deliveryId") },
-                new Object[] { DeliveryParcel.builder()
-                        .measurements(new com.commercetools.importapi.models.orders.ParcelMeasurementsImpl()) },
-                new Object[] { DeliveryParcel.builder()
-                        .trackingData(new com.commercetools.importapi.models.orders.TrackingDataImpl()) },
-                new Object[] { DeliveryParcel.builder()
-                        .items(Collections
-                                .singletonList(new com.commercetools.importapi.models.orders.DeliveryItemImpl())) } };
+        return new Object[][] { new Object[] { "deliveryId", DeliveryParcel.builder().deliveryId("deliveryId") },
+                new Object[] { "measurements",
+                        DeliveryParcel.builder()
+                                .measurements(new com.commercetools.importapi.models.orders.ParcelMeasurementsImpl()) },
+                new Object[] { "trackingData",
+                        DeliveryParcel.builder()
+                                .trackingData(new com.commercetools.importapi.models.orders.TrackingDataImpl()) },
+                new Object[] { "items",
+                        DeliveryParcel.builder()
+                                .items(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.DeliveryItemImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/OrderFieldTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/OrderFieldTest.java
index 808247fe3b9..b391915ef0e 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/OrderFieldTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/OrderFieldTest.java
@@ -3,56 +3,55 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderFieldTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderFieldBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderFieldBuilder builder) {
         OrderField orderField = builder.buildUnchecked();
         Assertions.assertThat(orderField).isInstanceOf(OrderField.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { OrderField.builder()
-                        .addReturnInfo(new com.commercetools.importapi.models.order_patches.ReturnInfoImpl()) },
-                new Object[] { OrderField.builder()
-                        .addParcelToDelivery(
-                            new com.commercetools.importapi.models.order_patches.DeliveryParcelImpl()) },
-                new Object[] { OrderField.builder()
-                        .addDeliveries(Collections.singletonList(
-                            new com.commercetools.importapi.models.order_patches.DeliveryDraftImpl())) },
-                new Object[] { OrderField.builder()
-                        .removeDelivery(
-                            new com.commercetools.importapi.models.order_patches.RemoveDeliveryDraftImpl()) },
-                new Object[] { OrderField.builder()
+                new Object[] { "addReturnInfo",
+                        OrderField.builder()
+                                .addReturnInfo(new com.commercetools.importapi.models.order_patches.ReturnInfoImpl()) },
+                new Object[] { "addParcelToDelivery",
+                        OrderField.builder()
+                                .addParcelToDelivery(
+                                    new com.commercetools.importapi.models.order_patches.DeliveryParcelImpl()) },
+                new Object[] { "addDeliveries",
+                        OrderField.builder()
+                                .addDeliveries(Collections.singletonList(
+                                    new com.commercetools.importapi.models.order_patches.DeliveryDraftImpl())) },
+                new Object[] { "removeDelivery",
+                        OrderField.builder()
+                                .removeDelivery(
+                                    new com.commercetools.importapi.models.order_patches.RemoveDeliveryDraftImpl()) },
+                new Object[] { "removeParcelFromDelivery", OrderField.builder()
                         .removeParcelFromDelivery(
                             new com.commercetools.importapi.models.order_patches.RemoveParcelFromDeliveryDraftImpl()) },
-                new Object[] { OrderField.builder()
-                        .setDeliveryAddress(
-                            new com.commercetools.importapi.models.order_patches.DeliveryAddressDraftImpl()) },
-                new Object[] { OrderField.builder()
+                new Object[] { "setDeliveryAddress",
+                        OrderField.builder()
+                                .setDeliveryAddress(
+                                    new com.commercetools.importapi.models.order_patches.DeliveryAddressDraftImpl()) },
+                new Object[] { "setParcelMeasurements", OrderField.builder()
                         .setParcelMeasurements(
                             new com.commercetools.importapi.models.order_patches.ParcelMeasurementDraftImpl()) },
-                new Object[] { OrderField.builder()
-                        .setParcelTrackingData(
-                            new com.commercetools.importapi.models.order_patches.ParcelTrackingDataImpl()) },
-                new Object[] { OrderField.builder()
-                        .setParcelItems(Collections.singletonList(
-                            new com.commercetools.importapi.models.order_patches.ParcelItemsImpl())) } };
+                new Object[] { "setParcelTrackingData",
+                        OrderField.builder()
+                                .setParcelTrackingData(
+                                    new com.commercetools.importapi.models.order_patches.ParcelTrackingDataImpl()) },
+                new Object[] { "setParcelItems",
+                        OrderField.builder()
+                                .setParcelItems(Collections.singletonList(
+                                    new com.commercetools.importapi.models.order_patches.ParcelItemsImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/OrderPatchImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/OrderPatchImportTest.java
index a1eb2e88aed..019ba455f0a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/OrderPatchImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/OrderPatchImportTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.order_patches;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderPatchImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderPatchImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderPatchImportBuilder builder) {
         OrderPatchImport orderPatchImport = builder.buildUnchecked();
         Assertions.assertThat(orderPatchImport).isInstanceOf(OrderPatchImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderPatchImport.builder().orderNumber("orderNumber") },
-                new Object[] { OrderPatchImport.builder()
+        return new Object[][] { new Object[] { "orderNumber", OrderPatchImport.builder().orderNumber("orderNumber") },
+                new Object[] { "fields", OrderPatchImport.builder()
                         .fields(new com.commercetools.importapi.models.order_patches.OrderFieldImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ParcelItemsTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ParcelItemsTest.java
index 028cb399f15..81d7d9aa636 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ParcelItemsTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ParcelItemsTest.java
@@ -3,32 +3,26 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelItemsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelItemsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelItemsBuilder builder) {
         ParcelItems parcelItems = builder.buildUnchecked();
         Assertions.assertThat(parcelItems).isInstanceOf(ParcelItems.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelItems.builder().parcelId("parcelId") }, new Object[] { ParcelItems
-                .builder()
-                .items(Collections.singletonList(new com.commercetools.importapi.models.orders.DeliveryItemImpl())) } };
+        return new Object[][] { new Object[] { "parcelId", ParcelItems.builder().parcelId("parcelId") },
+                new Object[] { "items",
+                        ParcelItems.builder()
+                                .items(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.DeliveryItemImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ParcelMeasurementDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ParcelMeasurementDraftTest.java
index d561831a0d1..43bd488aba5 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ParcelMeasurementDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ParcelMeasurementDraftTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.order_patches;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelMeasurementDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelMeasurementDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelMeasurementDraftBuilder builder) {
         ParcelMeasurementDraft parcelMeasurementDraft = builder.buildUnchecked();
         Assertions.assertThat(parcelMeasurementDraft).isInstanceOf(ParcelMeasurementDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelMeasurementDraft.builder().parcelId("parcelId") },
-                new Object[] { ParcelMeasurementDraft.builder()
+        return new Object[][] { new Object[] { "parcelId", ParcelMeasurementDraft.builder().parcelId("parcelId") },
+                new Object[] { "measurements", ParcelMeasurementDraft.builder()
                         .measurements(new com.commercetools.importapi.models.orders.ParcelMeasurementsImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ParcelTrackingDataTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ParcelTrackingDataTest.java
index 8663d27cdbb..ee4a70310d7 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ParcelTrackingDataTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ParcelTrackingDataTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.order_patches;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelTrackingDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelTrackingDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelTrackingDataBuilder builder) {
         ParcelTrackingData parcelTrackingData = builder.buildUnchecked();
         Assertions.assertThat(parcelTrackingData).isInstanceOf(ParcelTrackingData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelTrackingData.builder().parcelId("parcelId") },
-                new Object[] { ParcelTrackingData.builder()
+        return new Object[][] { new Object[] { "parcelId", ParcelTrackingData.builder().parcelId("parcelId") },
+                new Object[] { "trackingData", ParcelTrackingData.builder()
                         .trackingData(new com.commercetools.importapi.models.orders.TrackingDataImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/RemoveDeliveryDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/RemoveDeliveryDraftTest.java
index 0e091a505ff..66bd389c84c 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/RemoveDeliveryDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/RemoveDeliveryDraftTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.order_patches;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveDeliveryDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveDeliveryDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveDeliveryDraftBuilder builder) {
         RemoveDeliveryDraft removeDeliveryDraft = builder.buildUnchecked();
         Assertions.assertThat(removeDeliveryDraft).isInstanceOf(RemoveDeliveryDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveDeliveryDraft.builder().id("id") } };
+        return new Object[][] { new Object[] { "id", RemoveDeliveryDraft.builder().id("id") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/RemoveParcelFromDeliveryDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/RemoveParcelFromDeliveryDraftTest.java
index 6d12227eff0..4359d7e7a79 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/RemoveParcelFromDeliveryDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/RemoveParcelFromDeliveryDraftTest.java
@@ -1,30 +1,23 @@
 
 package com.commercetools.importapi.models.order_patches;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class RemoveParcelFromDeliveryDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(RemoveParcelFromDeliveryDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, RemoveParcelFromDeliveryDraftBuilder builder) {
         RemoveParcelFromDeliveryDraft removeParcelFromDeliveryDraft = builder.buildUnchecked();
         Assertions.assertThat(removeParcelFromDeliveryDraft).isInstanceOf(RemoveParcelFromDeliveryDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { RemoveParcelFromDeliveryDraft.builder().parcelId("parcelId") } };
+        return new Object[][] {
+                new Object[] { "parcelId", RemoveParcelFromDeliveryDraft.builder().parcelId("parcelId") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ReturnInfoTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ReturnInfoTest.java
index 65feb5dd93b..b3320194c3d 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ReturnInfoTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ReturnInfoTest.java
@@ -4,35 +4,29 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReturnInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReturnInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReturnInfoBuilder builder) {
         ReturnInfo returnInfo = builder.buildUnchecked();
         Assertions.assertThat(returnInfo).isInstanceOf(ReturnInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ReturnInfo.builder()
-                        .items(Collections.singletonList(
-                            new com.commercetools.importapi.models.order_patches.ReturnItemDraftImpl())) },
-                new Object[] { ReturnInfo.builder().returnTrackingId("returnTrackingId") },
-                new Object[] { ReturnInfo.builder().returnDate(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "items",
+                        ReturnInfo.builder()
+                                .items(Collections.singletonList(
+                                    new com.commercetools.importapi.models.order_patches.ReturnItemDraftImpl())) },
+                new Object[] { "returnTrackingId", ReturnInfo.builder().returnTrackingId("returnTrackingId") },
+                new Object[] { "returnDate",
+                        ReturnInfo.builder().returnDate(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ReturnItemDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ReturnItemDraftTest.java
index f280cc2cc8d..c33ee437383 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ReturnItemDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/order_patches/ReturnItemDraftTest.java
@@ -1,36 +1,29 @@
 
 package com.commercetools.importapi.models.order_patches;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReturnItemDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReturnItemDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReturnItemDraftBuilder builder) {
         ReturnItemDraft returnItemDraft = builder.buildUnchecked();
         Assertions.assertThat(returnItemDraft).isInstanceOf(ReturnItemDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReturnItemDraft.builder().quantity(8L) },
-                new Object[] { ReturnItemDraft.builder().lineItemId("lineItemId") },
-                new Object[] { ReturnItemDraft.builder().customLineItemId("customLineItemId") },
-                new Object[] { ReturnItemDraft.builder().comment("comment") },
-                new Object[] { ReturnItemDraft.builder()
-                        .shipmentState(com.commercetools.importapi.models.order_patches.ReturnShipmentState
-                                .findEnum("Advised")) } };
+        return new Object[][] { new Object[] { "quantity", ReturnItemDraft.builder().quantity(8L) },
+                new Object[] { "lineItemId", ReturnItemDraft.builder().lineItemId("lineItemId") },
+                new Object[] { "customLineItemId", ReturnItemDraft.builder().customLineItemId("customLineItemId") },
+                new Object[] { "comment", ReturnItemDraft.builder().comment("comment") },
+                new Object[] { "shipmentState",
+                        ReturnItemDraft.builder()
+                                .shipmentState(com.commercetools.importapi.models.order_patches.ReturnShipmentState
+                                        .findEnum("Advised")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/CartClassificationTierTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/CartClassificationTierTest.java
index e590a9b9d7f..17942717d9a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/CartClassificationTierTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/CartClassificationTierTest.java
@@ -3,36 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CartClassificationTierTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CartClassificationTierBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CartClassificationTierBuilder builder) {
         CartClassificationTier cartClassificationTier = builder.buildUnchecked();
         Assertions.assertThat(cartClassificationTier).isInstanceOf(CartClassificationTier.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CartClassificationTier.builder().value("value") },
-                new Object[] { CartClassificationTier.builder()
-                        .price(new com.commercetools.importapi.models.common.MoneyImpl()) },
-                new Object[] { CartClassificationTier.builder()
-                        .tiers(Collections.singletonList(
-                            new com.commercetools.importapi.models.orders.ShippingRatePriceTierImpl())) },
-                new Object[] { CartClassificationTier.builder().isMatching(true) } };
+        return new Object[][] { new Object[] { "value", CartClassificationTier.builder().value("value") },
+                new Object[] { "price",
+                        CartClassificationTier.builder()
+                                .price(new com.commercetools.importapi.models.common.MoneyImpl()) },
+                new Object[] { "tiers",
+                        CartClassificationTier.builder()
+                                .tiers(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.ShippingRatePriceTierImpl())) },
+                new Object[] { "isMatching", CartClassificationTier.builder().isMatching(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ClassificationShippingRateInputTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ClassificationShippingRateInputTest.java
index 9ff0adf3c96..c0b6aa4b702 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ClassificationShippingRateInputTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ClassificationShippingRateInputTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.orders;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ClassificationShippingRateInputTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ClassificationShippingRateInputBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ClassificationShippingRateInputBuilder builder) {
         ClassificationShippingRateInput classificationShippingRateInput = builder.buildUnchecked();
         Assertions.assertThat(classificationShippingRateInput).isInstanceOf(ClassificationShippingRateInput.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ClassificationShippingRateInput.builder().key("key") },
-                new Object[] { ClassificationShippingRateInput.builder()
+        return new Object[][] { new Object[] { "key", ClassificationShippingRateInput.builder().key("key") },
+                new Object[] { "label", ClassificationShippingRateInput.builder()
                         .label(new com.commercetools.importapi.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/CustomLineItemDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/CustomLineItemDraftTest.java
index 4b3b6d7e115..fd2ea80efbe 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/CustomLineItemDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/CustomLineItemDraftTest.java
@@ -3,56 +3,53 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomLineItemDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomLineItemDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomLineItemDraftBuilder builder) {
         CustomLineItemDraft customLineItemDraft = builder.buildUnchecked();
         Assertions.assertThat(customLineItemDraft).isInstanceOf(CustomLineItemDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomLineItemDraft.builder()
-                        .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { CustomLineItemDraft.builder()
-                        .money(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
-                new Object[] { CustomLineItemDraft.builder()
+                new Object[] { "name",
+                        CustomLineItemDraft.builder()
+                                .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "money",
+                        CustomLineItemDraft.builder()
+                                .money(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
+                new Object[] { "taxedPrice", CustomLineItemDraft.builder()
                         .taxedPrice(new com.commercetools.importapi.models.orders.CustomLineItemTaxedPriceImpl()) },
-                new Object[] { CustomLineItemDraft.builder()
-                        .totalPrice(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
-                new Object[] { CustomLineItemDraft.builder().slug("slug") },
-                new Object[] { CustomLineItemDraft.builder().quantity(8L) },
-                new Object[] {
+                new Object[] { "totalPrice",
+                        CustomLineItemDraft.builder()
+                                .totalPrice(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
+                new Object[] { "slug", CustomLineItemDraft.builder().slug("slug") },
+                new Object[] { "quantity", CustomLineItemDraft.builder().quantity(8L) },
+                new Object[] { "state",
                         CustomLineItemDraft.builder()
                                 .state(Collections.singletonList(
                                     new com.commercetools.importapi.models.orders.ItemStateImpl())) },
-                new Object[] { CustomLineItemDraft.builder()
+                new Object[] { "taxCategory", CustomLineItemDraft.builder()
                         .taxCategory(new com.commercetools.importapi.models.common.TaxCategoryKeyReferenceImpl()) },
-                new Object[] { CustomLineItemDraft.builder()
-                        .taxRate(new com.commercetools.importapi.models.prices.TaxRateImpl()) },
-                new Object[] { CustomLineItemDraft.builder()
+                new Object[] { "taxRate",
+                        CustomLineItemDraft.builder()
+                                .taxRate(new com.commercetools.importapi.models.prices.TaxRateImpl()) },
+                new Object[] { "externalTaxRate", CustomLineItemDraft.builder()
                         .externalTaxRate(new com.commercetools.importapi.models.orders.ExternalTaxRateDraftImpl()) },
-                new Object[] { CustomLineItemDraft.builder()
+                new Object[] { "discountedPricePerQuantity", CustomLineItemDraft.builder()
                         .discountedPricePerQuantity(Collections.singletonList(
                             new com.commercetools.importapi.models.orders.DiscountedLineItemPriceDraftImpl())) },
-                new Object[] { CustomLineItemDraft.builder()
-                        .shippingDetails(
-                            new com.commercetools.importapi.models.orders.ItemShippingDetailsDraftImpl()) } };
+                new Object[] { "shippingDetails",
+                        CustomLineItemDraft.builder()
+                                .shippingDetails(
+                                    new com.commercetools.importapi.models.orders.ItemShippingDetailsDraftImpl()) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/CustomLineItemTaxedPriceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/CustomLineItemTaxedPriceTest.java
index a9958e75660..384733d6511 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/CustomLineItemTaxedPriceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/CustomLineItemTaxedPriceTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.importapi.models.orders;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomLineItemTaxedPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomLineItemTaxedPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomLineItemTaxedPriceBuilder builder) {
         CustomLineItemTaxedPrice customLineItemTaxedPrice = builder.buildUnchecked();
         Assertions.assertThat(customLineItemTaxedPrice).isInstanceOf(CustomLineItemTaxedPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomLineItemTaxedPrice.builder()
-                        .totalNet(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
-                new Object[] { CustomLineItemTaxedPrice.builder()
+                new Object[] { "totalNet",
+                        CustomLineItemTaxedPrice.builder()
+                                .totalNet(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
+                new Object[] { "totalGross", CustomLineItemTaxedPrice.builder()
                         .totalGross(new com.commercetools.importapi.models.common.TypedMoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DeliveryItemTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DeliveryItemTest.java
index f882342bc01..529d2c0e1af 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DeliveryItemTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DeliveryItemTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.orders;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryItemTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryItemBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryItemBuilder builder) {
         DeliveryItem deliveryItem = builder.buildUnchecked();
         Assertions.assertThat(deliveryItem).isInstanceOf(DeliveryItem.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DeliveryItem.builder().id("id") },
-                new Object[] { DeliveryItem.builder().quantity(8L) } };
+        return new Object[][] { new Object[] { "id", DeliveryItem.builder().id("id") },
+                new Object[] { "quantity", DeliveryItem.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DeliveryTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DeliveryTest.java
index 57c3f68b563..5b53c10fc4d 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DeliveryTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DeliveryTest.java
@@ -4,39 +4,32 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DeliveryTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DeliveryBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DeliveryBuilder builder) {
         Delivery delivery = builder.buildUnchecked();
         Assertions.assertThat(delivery).isInstanceOf(Delivery.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Delivery.builder().id("id") },
-                new Object[] { Delivery.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Delivery.builder()
-                        .items(Collections
-                                .singletonList(new com.commercetools.importapi.models.orders.DeliveryItemImpl())) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Delivery.builder().id("id") },
+                new Object[] { "createdAt", Delivery.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "items",
+                        Delivery.builder()
+                                .items(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.DeliveryItemImpl())) },
+                new Object[] { "parcels",
                         Delivery.builder()
                                 .parcels(Collections
                                         .singletonList(new com.commercetools.importapi.models.orders.ParcelImpl())) },
-                new Object[] {
+                new Object[] { "address",
                         Delivery.builder().address(new com.commercetools.importapi.models.common.AddressImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DiscountCodeInfoTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DiscountCodeInfoTest.java
index 6b143fc3eaf..ba531ec2e86 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DiscountCodeInfoTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DiscountCodeInfoTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.importapi.models.orders;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountCodeInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountCodeInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountCodeInfoBuilder builder) {
         DiscountCodeInfo discountCodeInfo = builder.buildUnchecked();
         Assertions.assertThat(discountCodeInfo).isInstanceOf(DiscountCodeInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountCodeInfo.builder()
+                new Object[] { "discountCode", DiscountCodeInfo.builder()
                         .discountCode(new com.commercetools.importapi.models.common.DiscountCodeKeyReferenceImpl()) },
-                new Object[] { DiscountCodeInfo.builder()
+                new Object[] { "state", DiscountCodeInfo.builder()
                         .state(com.commercetools.importapi.models.orders.DiscountCodeState.findEnum("NotActive")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DiscountedLineItemPortionTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DiscountedLineItemPortionTest.java
index 453961fb49f..4afd0518276 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DiscountedLineItemPortionTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DiscountedLineItemPortionTest.java
@@ -1,33 +1,25 @@
 
 package com.commercetools.importapi.models.orders;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedLineItemPortionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedLineItemPortionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedLineItemPortionBuilder builder) {
         DiscountedLineItemPortion discountedLineItemPortion = builder.buildUnchecked();
         Assertions.assertThat(discountedLineItemPortion).isInstanceOf(DiscountedLineItemPortion.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountedLineItemPortion.builder()
+                new Object[] { "discount", DiscountedLineItemPortion.builder()
                         .discount(new com.commercetools.importapi.models.common.CartDiscountKeyReferenceImpl()) },
-                new Object[] { DiscountedLineItemPortion.builder()
+                new Object[] { "discountedAmount", DiscountedLineItemPortion.builder()
                         .discountedAmount(new com.commercetools.importapi.models.common.MoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DiscountedLineItemPriceDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DiscountedLineItemPriceDraftTest.java
index 9296a4aee5f..e9396cd081b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DiscountedLineItemPriceDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/DiscountedLineItemPriceDraftTest.java
@@ -3,35 +3,29 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DiscountedLineItemPriceDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DiscountedLineItemPriceDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DiscountedLineItemPriceDraftBuilder builder) {
         DiscountedLineItemPriceDraft discountedLineItemPriceDraft = builder.buildUnchecked();
         Assertions.assertThat(discountedLineItemPriceDraft).isInstanceOf(DiscountedLineItemPriceDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DiscountedLineItemPriceDraft.builder()
-                        .value(new com.commercetools.importapi.models.common.MoneyImpl()) },
-                new Object[] { DiscountedLineItemPriceDraft.builder()
-                        .includedDiscounts(Collections.singletonList(
-                            new com.commercetools.importapi.models.orders.DiscountedLineItemPortionImpl())) } };
+                new Object[] { "value",
+                        DiscountedLineItemPriceDraft.builder()
+                                .value(new com.commercetools.importapi.models.common.MoneyImpl()) },
+                new Object[] { "includedDiscounts",
+                        DiscountedLineItemPriceDraft.builder()
+                                .includedDiscounts(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.DiscountedLineItemPortionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ExternalTaxRateDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ExternalTaxRateDraftTest.java
index 7b03d4bc311..9fa2885d0a5 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ExternalTaxRateDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ExternalTaxRateDraftTest.java
@@ -3,38 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ExternalTaxRateDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ExternalTaxRateDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ExternalTaxRateDraftBuilder builder) {
         ExternalTaxRateDraft externalTaxRateDraft = builder.buildUnchecked();
         Assertions.assertThat(externalTaxRateDraft).isInstanceOf(ExternalTaxRateDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ExternalTaxRateDraft.builder().name("name") },
-                new Object[] { ExternalTaxRateDraft.builder().amount(0.43789625) },
-                new Object[] { ExternalTaxRateDraft.builder().country("country") },
-                new Object[] { ExternalTaxRateDraft.builder().state("state") },
-                new Object[] {
+        return new Object[][] { new Object[] { "name", ExternalTaxRateDraft.builder().name("name") },
+                new Object[] { "amount", ExternalTaxRateDraft.builder().amount(0.43789625) },
+                new Object[] { "country", ExternalTaxRateDraft.builder().country("country") },
+                new Object[] { "state", ExternalTaxRateDraft.builder().state("state") },
+                new Object[] { "subRates",
                         ExternalTaxRateDraft.builder()
                                 .subRates(Collections
                                         .singletonList(new com.commercetools.importapi.models.prices.SubRateImpl())) },
-                new Object[] { ExternalTaxRateDraft.builder().includedInPrice(true) } };
+                new Object[] { "includedInPrice", ExternalTaxRateDraft.builder().includedInPrice(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ItemShippingDetailsDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ItemShippingDetailsDraftTest.java
index d684d40cf6b..c87bdc426eb 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ItemShippingDetailsDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ItemShippingDetailsDraftTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ItemShippingDetailsDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ItemShippingDetailsDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ItemShippingDetailsDraftBuilder builder) {
         ItemShippingDetailsDraft itemShippingDetailsDraft = builder.buildUnchecked();
         Assertions.assertThat(itemShippingDetailsDraft).isInstanceOf(ItemShippingDetailsDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ItemShippingDetailsDraft.builder()
-                .targets(Collections
-                        .singletonList(new com.commercetools.importapi.models.orders.ItemShippingTargetImpl())) } };
+        return new Object[][] { new Object[] { "targets",
+                ItemShippingDetailsDraft.builder()
+                        .targets(Collections.singletonList(
+                            new com.commercetools.importapi.models.orders.ItemShippingTargetImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ItemShippingTargetTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ItemShippingTargetTest.java
index 01694feb040..a9414eee1d4 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ItemShippingTargetTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ItemShippingTargetTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.orders;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ItemShippingTargetTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ItemShippingTargetBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ItemShippingTargetBuilder builder) {
         ItemShippingTarget itemShippingTarget = builder.buildUnchecked();
         Assertions.assertThat(itemShippingTarget).isInstanceOf(ItemShippingTarget.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ItemShippingTarget.builder().addressKey("addressKey") },
-                new Object[] { ItemShippingTarget.builder().quantity(8L) } };
+        return new Object[][] { new Object[] { "addressKey", ItemShippingTarget.builder().addressKey("addressKey") },
+                new Object[] { "quantity", ItemShippingTarget.builder().quantity(8L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ItemStateTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ItemStateTest.java
index 5c19cfa1665..5f4fe4522be 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ItemStateTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ItemStateTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.orders;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ItemStateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ItemStateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ItemStateBuilder builder) {
         ItemState itemState = builder.buildUnchecked();
         Assertions.assertThat(itemState).isInstanceOf(ItemState.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ItemState.builder().quantity(8L) }, new Object[] {
+        return new Object[][] { new Object[] { "quantity", ItemState.builder().quantity(8L) }, new Object[] { "state",
                 ItemState.builder().state(new com.commercetools.importapi.models.common.StateKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/LineItemImportDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/LineItemImportDraftTest.java
index 483d54624b5..5f44103aa60 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/LineItemImportDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/LineItemImportDraftTest.java
@@ -3,54 +3,51 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LineItemImportDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LineItemImportDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LineItemImportDraftBuilder builder) {
         LineItemImportDraft lineItemImportDraft = builder.buildUnchecked();
         Assertions.assertThat(lineItemImportDraft).isInstanceOf(LineItemImportDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { LineItemImportDraft.builder()
-                        .product(new com.commercetools.importapi.models.common.ProductKeyReferenceImpl()) },
-                new Object[] { LineItemImportDraft.builder()
-                        .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { LineItemImportDraft.builder()
+                new Object[] { "product",
+                        LineItemImportDraft.builder()
+                                .product(new com.commercetools.importapi.models.common.ProductKeyReferenceImpl()) },
+                new Object[] { "name",
+                        LineItemImportDraft.builder()
+                                .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "variant", LineItemImportDraft.builder()
                         .variant(
                             new com.commercetools.importapi.models.orders.LineItemProductVariantImportDraftImpl()) },
-                new Object[] { LineItemImportDraft.builder()
-                        .price(new com.commercetools.importapi.models.orders.LineItemPriceImpl()) },
-                new Object[] { LineItemImportDraft.builder().quantity(8L) },
-                new Object[] {
+                new Object[] { "price",
+                        LineItemImportDraft.builder()
+                                .price(new com.commercetools.importapi.models.orders.LineItemPriceImpl()) },
+                new Object[] { "quantity", LineItemImportDraft.builder().quantity(8L) },
+                new Object[] { "state",
                         LineItemImportDraft.builder()
                                 .state(Collections.singletonList(
                                     new com.commercetools.importapi.models.orders.ItemStateImpl())) },
-                new Object[] { LineItemImportDraft.builder()
+                new Object[] { "supplyChannel", LineItemImportDraft.builder()
                         .supplyChannel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
-                new Object[] { LineItemImportDraft.builder()
+                new Object[] { "distributionChannel", LineItemImportDraft.builder()
                         .distributionChannel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
-                new Object[] { LineItemImportDraft.builder()
-                        .taxRate(new com.commercetools.importapi.models.prices.TaxRateImpl()) },
-                new Object[] { LineItemImportDraft.builder()
-                        .shippingDetails(
-                            new com.commercetools.importapi.models.orders.ItemShippingDetailsDraftImpl()) },
-                new Object[] { LineItemImportDraft.builder()
+                new Object[] { "taxRate",
+                        LineItemImportDraft.builder()
+                                .taxRate(new com.commercetools.importapi.models.prices.TaxRateImpl()) },
+                new Object[] { "shippingDetails",
+                        LineItemImportDraft.builder()
+                                .shippingDetails(
+                                    new com.commercetools.importapi.models.orders.ItemShippingDetailsDraftImpl()) },
+                new Object[] { "custom", LineItemImportDraft.builder()
                         .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/LineItemPriceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/LineItemPriceTest.java
index 39b56b79320..54e93fc398d 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/LineItemPriceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/LineItemPriceTest.java
@@ -4,46 +4,42 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LineItemPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LineItemPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LineItemPriceBuilder builder) {
         LineItemPrice lineItemPrice = builder.buildUnchecked();
         Assertions.assertThat(lineItemPrice).isInstanceOf(LineItemPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "value",
                         LineItemPrice.builder().value(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
-                new Object[] { LineItemPrice.builder().country("country") },
-                new Object[] { LineItemPrice.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { LineItemPrice.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { LineItemPrice.builder()
+                new Object[] { "country", LineItemPrice.builder().country("country") },
+                new Object[] { "validFrom",
+                        LineItemPrice.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        LineItemPrice.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "customerGroup", LineItemPrice.builder()
                         .customerGroup(new com.commercetools.importapi.models.common.CustomerGroupKeyReferenceImpl()) },
-                new Object[] { LineItemPrice.builder()
-                        .channel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
-                new Object[] { LineItemPrice.builder()
-                        .discounted(new com.commercetools.importapi.models.common.DiscountedPriceImpl()) },
-                new Object[] {
+                new Object[] { "channel",
+                        LineItemPrice.builder()
+                                .channel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
+                new Object[] { "discounted",
+                        LineItemPrice.builder()
+                                .discounted(new com.commercetools.importapi.models.common.DiscountedPriceImpl()) },
+                new Object[] { "tiers",
                         LineItemPrice.builder()
                                 .tiers(Collections.singletonList(
                                     new com.commercetools.importapi.models.common.PriceTierImpl())) },
-                new Object[] { LineItemPrice.builder()
+                new Object[] { "custom", LineItemPrice.builder()
                         .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/LineItemProductVariantImportDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/LineItemProductVariantImportDraftTest.java
index bba8e4c6bb8..6b8c44da143 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/LineItemProductVariantImportDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/LineItemProductVariantImportDraftTest.java
@@ -3,39 +3,36 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LineItemProductVariantImportDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LineItemProductVariantImportDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LineItemProductVariantImportDraftBuilder builder) {
         LineItemProductVariantImportDraft lineItemProductVariantImportDraft = builder.buildUnchecked();
         Assertions.assertThat(lineItemProductVariantImportDraft).isInstanceOf(LineItemProductVariantImportDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LineItemProductVariantImportDraft.builder()
-                .productVariant(new com.commercetools.importapi.models.common.ProductVariantKeyReferenceImpl()) },
-                new Object[] { LineItemProductVariantImportDraft.builder().sku("sku") },
-                new Object[] { LineItemProductVariantImportDraft.builder()
-                        .prices(Collections
-                                .singletonList(new com.commercetools.importapi.models.orders.LineItemPriceImpl())) },
-                new Object[] { LineItemProductVariantImportDraft.builder()
-                        .attributes(Collections.singletonList(
-                            new com.commercetools.importapi.models.productvariants.AttributeImpl())) },
-                new Object[] { LineItemProductVariantImportDraft.builder()
+        return new Object[][] {
+                new Object[] { "productVariant",
+                        LineItemProductVariantImportDraft.builder()
+                                .productVariant(
+                                    new com.commercetools.importapi.models.common.ProductVariantKeyReferenceImpl()) },
+                new Object[] { "sku", LineItemProductVariantImportDraft.builder().sku("sku") },
+                new Object[] { "prices",
+                        LineItemProductVariantImportDraft.builder()
+                                .prices(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.LineItemPriceImpl())) },
+                new Object[] { "attributes",
+                        LineItemProductVariantImportDraft.builder()
+                                .attributes(Collections.singletonList(
+                                    new com.commercetools.importapi.models.productvariants.AttributeImpl())) },
+                new Object[] { "images", LineItemProductVariantImportDraft.builder()
                         .images(
                             Collections.singletonList(new com.commercetools.importapi.models.common.ImageImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/OrderImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/OrderImportTest.java
index 2fff01dbf02..cdec2356344 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/OrderImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/OrderImportTest.java
@@ -4,78 +4,82 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class OrderImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(OrderImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, OrderImportBuilder builder) {
         OrderImport orderImport = builder.buildUnchecked();
         Assertions.assertThat(orderImport).isInstanceOf(OrderImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { OrderImport.builder().orderNumber("orderNumber") },
-                new Object[] { OrderImport.builder()
-                        .customer(new com.commercetools.importapi.models.common.CustomerKeyReferenceImpl()) },
-                new Object[] { OrderImport.builder().customerEmail("customerEmail") },
-                new Object[] { OrderImport.builder()
-                        .lineItems(Collections.singletonList(
-                            new com.commercetools.importapi.models.orders.LineItemImportDraftImpl())) },
-                new Object[] { OrderImport.builder()
-                        .customLineItems(Collections.singletonList(
-                            new com.commercetools.importapi.models.orders.CustomLineItemDraftImpl())) },
-                new Object[] { OrderImport.builder()
-                        .totalPrice(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
-                new Object[] { OrderImport.builder()
-                        .taxedPrice(new com.commercetools.importapi.models.orders.TaxedPriceImpl()) },
-                new Object[] { OrderImport.builder()
-                        .shippingAddress(new com.commercetools.importapi.models.common.AddressImpl()) },
-                new Object[] { OrderImport.builder()
-                        .billingAddress(new com.commercetools.importapi.models.common.AddressImpl()) },
-                new Object[] { OrderImport.builder()
+        return new Object[][] { new Object[] { "orderNumber", OrderImport.builder().orderNumber("orderNumber") },
+                new Object[] { "customer",
+                        OrderImport.builder()
+                                .customer(new com.commercetools.importapi.models.common.CustomerKeyReferenceImpl()) },
+                new Object[] { "customerEmail", OrderImport.builder().customerEmail("customerEmail") },
+                new Object[] { "lineItems",
+                        OrderImport.builder()
+                                .lineItems(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.LineItemImportDraftImpl())) },
+                new Object[] { "customLineItems",
+                        OrderImport.builder()
+                                .customLineItems(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.CustomLineItemDraftImpl())) },
+                new Object[] { "totalPrice",
+                        OrderImport.builder()
+                                .totalPrice(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
+                new Object[] { "taxedPrice",
+                        OrderImport.builder()
+                                .taxedPrice(new com.commercetools.importapi.models.orders.TaxedPriceImpl()) },
+                new Object[] { "shippingAddress",
+                        OrderImport.builder()
+                                .shippingAddress(new com.commercetools.importapi.models.common.AddressImpl()) },
+                new Object[] { "billingAddress",
+                        OrderImport.builder()
+                                .billingAddress(new com.commercetools.importapi.models.common.AddressImpl()) },
+                new Object[] { "customerGroup", OrderImport.builder()
                         .customerGroup(new com.commercetools.importapi.models.common.CustomerGroupKeyReferenceImpl()) },
-                new Object[] { OrderImport.builder().country("country") },
-                new Object[] { OrderImport.builder()
-                        .orderState(com.commercetools.importapi.models.orders.OrderState.findEnum("Open")) },
-                new Object[] { OrderImport.builder()
+                new Object[] { "country", OrderImport.builder().country("country") },
+                new Object[] { "orderState",
+                        OrderImport.builder()
+                                .orderState(com.commercetools.importapi.models.orders.OrderState.findEnum("Open")) },
+                new Object[] { "shipmentState", OrderImport.builder()
                         .shipmentState(com.commercetools.importapi.models.orders.ShipmentState.findEnum("Shipped")) },
-                new Object[] { OrderImport.builder()
+                new Object[] { "paymentState", OrderImport.builder()
                         .paymentState(com.commercetools.importapi.models.orders.PaymentState.findEnum("BalanceDue")) },
-                new Object[] { OrderImport.builder()
+                new Object[] { "shippingInfo", OrderImport.builder()
                         .shippingInfo(new com.commercetools.importapi.models.orders.ShippingInfoImportDraftImpl()) },
-                new Object[] { OrderImport.builder().completedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { OrderImport.builder()
-                        .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) },
-                new Object[] { OrderImport.builder()
+                new Object[] { "completedAt",
+                        OrderImport.builder().completedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "custom",
+                        OrderImport.builder()
+                                .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) },
+                new Object[] { "inventoryMode", OrderImport.builder()
                         .inventoryMode(com.commercetools.importapi.models.orders.InventoryMode.findEnum("TrackOnly")) },
-                new Object[] { OrderImport.builder()
+                new Object[] { "taxRoundingMode", OrderImport.builder()
                         .taxRoundingMode(com.commercetools.importapi.models.orders.RoundingMode.findEnum("HalfEven")) },
-                new Object[] {
+                new Object[] { "taxCalculationMode",
                         OrderImport.builder()
                                 .taxCalculationMode(com.commercetools.importapi.models.orders.TaxCalculationMode
                                         .findEnum("LineItemLevel")) },
-                new Object[] { OrderImport.builder()
-                        .origin(com.commercetools.importapi.models.orders.CartOrigin.findEnum("Customer")) },
-                new Object[] {
+                new Object[] { "origin",
+                        OrderImport.builder()
+                                .origin(com.commercetools.importapi.models.orders.CartOrigin.findEnum("Customer")) },
+                new Object[] { "itemShippingAddresses",
                         OrderImport.builder()
                                 .itemShippingAddresses(Collections
                                         .singletonList(new com.commercetools.importapi.models.common.AddressImpl())) },
-                new Object[] { OrderImport.builder()
-                        .store(new com.commercetools.importapi.models.common.StoreKeyReferenceImpl()) },
-                new Object[] { OrderImport.builder()
+                new Object[] { "store",
+                        OrderImport.builder()
+                                .store(new com.commercetools.importapi.models.common.StoreKeyReferenceImpl()) },
+                new Object[] { "state", OrderImport.builder()
                         .state(new com.commercetools.importapi.models.common.StateKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ParcelMeasurementsTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ParcelMeasurementsTest.java
index f5f164cc1aa..08b00023d7b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ParcelMeasurementsTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ParcelMeasurementsTest.java
@@ -1,33 +1,26 @@
 
 package com.commercetools.importapi.models.orders;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelMeasurementsTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelMeasurementsBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelMeasurementsBuilder builder) {
         ParcelMeasurements parcelMeasurements = builder.buildUnchecked();
         Assertions.assertThat(parcelMeasurements).isInstanceOf(ParcelMeasurements.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ParcelMeasurements.builder().heightInMillimeter(5) },
-                new Object[] { ParcelMeasurements.builder().lengthInMillimeter(4) },
-                new Object[] { ParcelMeasurements.builder().widthInMillimeter(2) },
-                new Object[] { ParcelMeasurements.builder().weightInGram(9) } };
+        return new Object[][] {
+                new Object[] { "heightInMillimeter", ParcelMeasurements.builder().heightInMillimeter(5) },
+                new Object[] { "lengthInMillimeter", ParcelMeasurements.builder().lengthInMillimeter(4) },
+                new Object[] { "widthInMillimeter", ParcelMeasurements.builder().widthInMillimeter(2) },
+                new Object[] { "weightInGram", ParcelMeasurements.builder().weightInGram(9) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ParcelTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ParcelTest.java
index 4e1494d0333..4ad8b610806 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ParcelTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ParcelTest.java
@@ -4,39 +4,34 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ParcelTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ParcelBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ParcelBuilder builder) {
         Parcel parcel = builder.buildUnchecked();
         Assertions.assertThat(parcel).isInstanceOf(Parcel.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { Parcel.builder().id("id") },
-                new Object[] { Parcel.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { Parcel.builder()
-                        .measurements(new com.commercetools.importapi.models.orders.ParcelMeasurementsImpl()) },
-                new Object[] { Parcel.builder()
-                        .trackingData(new com.commercetools.importapi.models.orders.TrackingDataImpl()) },
-                new Object[] { Parcel.builder()
-                        .items(Collections
-                                .singletonList(new com.commercetools.importapi.models.orders.DeliveryItemImpl())) },
-                new Object[] {
+        return new Object[][] { new Object[] { "id", Parcel.builder().id("id") },
+                new Object[] { "createdAt", Parcel.builder().createdAt(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "measurements",
+                        Parcel.builder()
+                                .measurements(new com.commercetools.importapi.models.orders.ParcelMeasurementsImpl()) },
+                new Object[] { "trackingData",
+                        Parcel.builder()
+                                .trackingData(new com.commercetools.importapi.models.orders.TrackingDataImpl()) },
+                new Object[] { "items",
+                        Parcel.builder()
+                                .items(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.DeliveryItemImpl())) },
+                new Object[] { "custom",
                         Parcel.builder().custom(new com.commercetools.importapi.models.customfields.CustomImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ScoreShippingRateInputTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ScoreShippingRateInputTest.java
index b060ae0ec11..bd53d7a4ca6 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ScoreShippingRateInputTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ScoreShippingRateInputTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.orders;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ScoreShippingRateInputTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ScoreShippingRateInputBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ScoreShippingRateInputBuilder builder) {
         ScoreShippingRateInput scoreShippingRateInput = builder.buildUnchecked();
         Assertions.assertThat(scoreShippingRateInput).isInstanceOf(ScoreShippingRateInput.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ScoreShippingRateInput.builder().score(9L) } };
+        return new Object[][] { new Object[] { "score", ScoreShippingRateInput.builder().score(9L) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ShippingInfoImportDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ShippingInfoImportDraftTest.java
index e740922056d..3fd676c5d65 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ShippingInfoImportDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ShippingInfoImportDraftTest.java
@@ -3,52 +3,51 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingInfoImportDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingInfoImportDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingInfoImportDraftBuilder builder) {
         ShippingInfoImportDraft shippingInfoImportDraft = builder.buildUnchecked();
         Assertions.assertThat(shippingInfoImportDraft).isInstanceOf(ShippingInfoImportDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { ShippingInfoImportDraft.builder().shippingMethodName("shippingMethodName") },
-                new Object[] { ShippingInfoImportDraft.builder()
-                        .price(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
-                new Object[] { ShippingInfoImportDraft.builder()
-                        .shippingRate(new com.commercetools.importapi.models.orders.ShippingRateDraftImpl()) },
-                new Object[] { ShippingInfoImportDraft.builder()
-                        .taxRate(new com.commercetools.importapi.models.prices.TaxRateImpl()) },
-                new Object[] { ShippingInfoImportDraft.builder()
+                new Object[] { "shippingMethodName",
+                        ShippingInfoImportDraft.builder().shippingMethodName("shippingMethodName") },
+                new Object[] { "price",
+                        ShippingInfoImportDraft.builder()
+                                .price(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
+                new Object[] { "shippingRate",
+                        ShippingInfoImportDraft.builder()
+                                .shippingRate(new com.commercetools.importapi.models.orders.ShippingRateDraftImpl()) },
+                new Object[] { "taxRate",
+                        ShippingInfoImportDraft.builder()
+                                .taxRate(new com.commercetools.importapi.models.prices.TaxRateImpl()) },
+                new Object[] { "taxCategory", ShippingInfoImportDraft.builder()
                         .taxCategory(new com.commercetools.importapi.models.common.TaxCategoryKeyReferenceImpl()) },
-                new Object[] { ShippingInfoImportDraft.builder()
-                        .shippingMethod(
-                            new com.commercetools.importapi.models.common.ShippingMethodKeyReferenceImpl()) },
-                new Object[] {
+                new Object[] { "shippingMethod",
+                        ShippingInfoImportDraft.builder()
+                                .shippingMethod(
+                                    new com.commercetools.importapi.models.common.ShippingMethodKeyReferenceImpl()) },
+                new Object[] { "deliveries",
                         ShippingInfoImportDraft.builder()
                                 .deliveries(Collections
                                         .singletonList(new com.commercetools.importapi.models.orders.DeliveryImpl())) },
-                new Object[] { ShippingInfoImportDraft.builder()
-                        .discountedPrice(
-                            new com.commercetools.importapi.models.orders.DiscountedLineItemPriceDraftImpl()) },
-                new Object[] { ShippingInfoImportDraft.builder()
-                        .shippingMethodState(com.commercetools.importapi.models.orders.ShippingMethodState
-                                .findEnum("DoesNotMatchCart")) } };
+                new Object[] { "discountedPrice",
+                        ShippingInfoImportDraft.builder()
+                                .discountedPrice(
+                                    new com.commercetools.importapi.models.orders.DiscountedLineItemPriceDraftImpl()) },
+                new Object[] { "shippingMethodState",
+                        ShippingInfoImportDraft.builder()
+                                .shippingMethodState(com.commercetools.importapi.models.orders.ShippingMethodState
+                                        .findEnum("DoesNotMatchCart")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ShippingRateDraftTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ShippingRateDraftTest.java
index 161918a3f39..aa1416e7deb 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ShippingRateDraftTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/ShippingRateDraftTest.java
@@ -3,37 +3,31 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ShippingRateDraftTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ShippingRateDraftBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ShippingRateDraftBuilder builder) {
         ShippingRateDraft shippingRateDraft = builder.buildUnchecked();
         Assertions.assertThat(shippingRateDraft).isInstanceOf(ShippingRateDraft.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "price",
                         ShippingRateDraft.builder().price(new com.commercetools.importapi.models.common.MoneyImpl()) },
-                new Object[] { ShippingRateDraft.builder()
-                        .freeAbove(new com.commercetools.importapi.models.common.MoneyImpl()) },
-                new Object[] { ShippingRateDraft.builder()
-                        .tiers(Collections.singletonList(
-                            new com.commercetools.importapi.models.orders.ShippingRatePriceTierImpl())) } };
+                new Object[] { "freeAbove",
+                        ShippingRateDraft.builder()
+                                .freeAbove(new com.commercetools.importapi.models.common.MoneyImpl()) },
+                new Object[] { "tiers",
+                        ShippingRateDraft.builder()
+                                .tiers(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.ShippingRatePriceTierImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/SyncInfoTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/SyncInfoTest.java
index 1c6e356f55c..ab051c6ba89 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/SyncInfoTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/SyncInfoTest.java
@@ -3,34 +3,27 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SyncInfoTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SyncInfoBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SyncInfoBuilder builder) {
         SyncInfo syncInfo = builder.buildUnchecked();
         Assertions.assertThat(syncInfo).isInstanceOf(SyncInfo.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { SyncInfo.builder()
-                        .channel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
-                new Object[] { SyncInfo.builder().externalId("externalId") },
-                new Object[] { SyncInfo.builder().syncedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "channel",
+                        SyncInfo.builder()
+                                .channel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
+                new Object[] { "externalId", SyncInfo.builder().externalId("externalId") },
+                new Object[] { "syncedAt", SyncInfo.builder().syncedAt(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/TaxPortionTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/TaxPortionTest.java
index 339f3b80a14..90dcbad919b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/TaxPortionTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/TaxPortionTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.orders;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxPortionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxPortionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxPortionBuilder builder) {
         TaxPortion taxPortion = builder.buildUnchecked();
         Assertions.assertThat(taxPortion).isInstanceOf(TaxPortion.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxPortion.builder().name("name") },
-                new Object[] { TaxPortion.builder().rate(0.45292872) }, new Object[] {
+        return new Object[][] { new Object[] { "name", TaxPortion.builder().name("name") },
+                new Object[] { "rate", TaxPortion.builder().rate(0.45292872) }, new Object[] { "amount",
                         TaxPortion.builder().amount(new com.commercetools.importapi.models.common.TypedMoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/TaxedPriceTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/TaxedPriceTest.java
index 2f2d32f8d32..b17f533cc99 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/TaxedPriceTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/TaxedPriceTest.java
@@ -3,37 +3,30 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxedPriceTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxedPriceBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxedPriceBuilder builder) {
         TaxedPrice taxedPrice = builder.buildUnchecked();
         Assertions.assertThat(taxedPrice).isInstanceOf(TaxedPrice.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "totalNet",
                         TaxedPrice.builder().totalNet(new com.commercetools.importapi.models.common.MoneyImpl()) },
-                new Object[] {
+                new Object[] { "totalGross",
                         TaxedPrice.builder().totalGross(new com.commercetools.importapi.models.common.MoneyImpl()) },
-                new Object[] { TaxedPrice.builder()
-                        .taxPortions(Collections
-                                .singletonList(new com.commercetools.importapi.models.orders.TaxPortionImpl())) } };
+                new Object[] { "taxPortions",
+                        TaxedPrice.builder()
+                                .taxPortions(Collections.singletonList(
+                                    new com.commercetools.importapi.models.orders.TaxPortionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/TrackingDataTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/TrackingDataTest.java
index f983d567320..b0f37bac015 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/TrackingDataTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/orders/TrackingDataTest.java
@@ -1,34 +1,27 @@
 
 package com.commercetools.importapi.models.orders;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TrackingDataTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TrackingDataBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TrackingDataBuilder builder) {
         TrackingData trackingData = builder.buildUnchecked();
         Assertions.assertThat(trackingData).isInstanceOf(TrackingData.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TrackingData.builder().trackingId("trackingId") },
-                new Object[] { TrackingData.builder().carrier("carrier") },
-                new Object[] { TrackingData.builder().provider("provider") },
-                new Object[] { TrackingData.builder().providerTransaction("providerTransaction") },
-                new Object[] { TrackingData.builder().isReturn(true) } };
+        return new Object[][] { new Object[] { "trackingId", TrackingData.builder().trackingId("trackingId") },
+                new Object[] { "carrier", TrackingData.builder().carrier("carrier") },
+                new Object[] { "provider", TrackingData.builder().provider("provider") },
+                new Object[] { "providerTransaction",
+                        TrackingData.builder().providerTransaction("providerTransaction") },
+                new Object[] { "isReturn", TrackingData.builder().isReturn(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/prices/PriceImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/prices/PriceImportTest.java
index fd4a8eaf592..b487c659c4b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/prices/PriceImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/prices/PriceImportTest.java
@@ -4,52 +4,49 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PriceImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PriceImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PriceImportBuilder builder) {
         PriceImport priceImport = builder.buildUnchecked();
         Assertions.assertThat(priceImport).isInstanceOf(PriceImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { PriceImport.builder().key("key") },
-                new Object[] {
+        return new Object[][] { new Object[] { "key", PriceImport.builder().key("key") },
+                new Object[] { "value",
                         PriceImport.builder().value(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
-                new Object[] { PriceImport.builder().country("country") },
-                new Object[] { PriceImport.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { PriceImport.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { PriceImport.builder()
+                new Object[] { "country", PriceImport.builder().country("country") },
+                new Object[] { "validFrom", PriceImport.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        PriceImport.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "customerGroup", PriceImport.builder()
                         .customerGroup(new com.commercetools.importapi.models.common.CustomerGroupKeyReferenceImpl()) },
-                new Object[] { PriceImport.builder()
-                        .channel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
-                new Object[] { PriceImport.builder()
-                        .discounted(new com.commercetools.importapi.models.common.DiscountedPriceImpl()) },
-                new Object[] { PriceImport.builder().staged(true) },
-                new Object[] {
+                new Object[] { "channel",
+                        PriceImport.builder()
+                                .channel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
+                new Object[] { "discounted",
+                        PriceImport.builder()
+                                .discounted(new com.commercetools.importapi.models.common.DiscountedPriceImpl()) },
+                new Object[] { "staged", PriceImport.builder().staged(true) },
+                new Object[] { "tiers",
                         PriceImport.builder()
                                 .tiers(Collections.singletonList(
                                     new com.commercetools.importapi.models.common.PriceTierImpl())) },
-                new Object[] { PriceImport.builder()
-                        .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) },
-                new Object[] { PriceImport.builder()
-                        .productVariant(
-                            new com.commercetools.importapi.models.common.ProductVariantKeyReferenceImpl()) },
-                new Object[] { PriceImport.builder()
+                new Object[] { "custom",
+                        PriceImport.builder()
+                                .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) },
+                new Object[] { "productVariant",
+                        PriceImport.builder()
+                                .productVariant(
+                                    new com.commercetools.importapi.models.common.ProductVariantKeyReferenceImpl()) },
+                new Object[] { "product", PriceImport.builder()
                         .product(new com.commercetools.importapi.models.common.ProductKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/prices/SubRateTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/prices/SubRateTest.java
index 089e2e64fb3..afdb6f50e8b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/prices/SubRateTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/prices/SubRateTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.prices;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SubRateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SubRateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SubRateBuilder builder) {
         SubRate subRate = builder.buildUnchecked();
         Assertions.assertThat(subRate).isInstanceOf(SubRate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SubRate.builder().name("name") },
-                new Object[] { SubRate.builder().amount(0.43789625) } };
+        return new Object[][] { new Object[] { "name", SubRate.builder().name("name") },
+                new Object[] { "amount", SubRate.builder().amount(0.43789625) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/prices/TaxRateTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/prices/TaxRateTest.java
index d22f75b2f9f..e41b59d2ffb 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/prices/TaxRateTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/prices/TaxRateTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TaxRateTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TaxRateBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TaxRateBuilder builder) {
         TaxRate taxRate = builder.buildUnchecked();
         Assertions.assertThat(taxRate).isInstanceOf(TaxRate.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TaxRate.builder().id("id") },
-                new Object[] { TaxRate.builder().name("name") }, new Object[] { TaxRate.builder().amount(0.43789625) },
-                new Object[] { TaxRate.builder().includedInPrice(true) },
-                new Object[] { TaxRate.builder().country("country") },
-                new Object[] { TaxRate.builder().state("state") },
-                new Object[] { TaxRate.builder()
+        return new Object[][] { new Object[] { "id", TaxRate.builder().id("id") },
+                new Object[] { "name", TaxRate.builder().name("name") },
+                new Object[] { "amount", TaxRate.builder().amount(0.43789625) },
+                new Object[] { "includedInPrice", TaxRate.builder().includedInPrice(true) },
+                new Object[] { "country", TaxRate.builder().country("country") },
+                new Object[] { "state", TaxRate.builder().state("state") },
+                new Object[] { "subRates", TaxRate.builder()
                         .subRates(
                             Collections.singletonList(new com.commercetools.importapi.models.prices.SubRateImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productdrafts/PriceDraftImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productdrafts/PriceDraftImportTest.java
index ee6f1e0acbe..7af713e0d53 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productdrafts/PriceDraftImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productdrafts/PriceDraftImportTest.java
@@ -4,48 +4,46 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class PriceDraftImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(PriceDraftImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, PriceDraftImportBuilder builder) {
         PriceDraftImport priceDraftImport = builder.buildUnchecked();
         Assertions.assertThat(priceDraftImport).isInstanceOf(PriceDraftImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { PriceDraftImport.builder()
-                        .value(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
-                new Object[] { PriceDraftImport.builder().country("country") },
-                new Object[] { PriceDraftImport.builder()
+                new Object[] { "value",
+                        PriceDraftImport.builder()
+                                .value(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
+                new Object[] { "country", PriceDraftImport.builder().country("country") },
+                new Object[] { "customerGroup", PriceDraftImport.builder()
                         .customerGroup(new com.commercetools.importapi.models.common.CustomerGroupKeyReferenceImpl()) },
-                new Object[] { PriceDraftImport.builder()
-                        .channel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
-                new Object[] { PriceDraftImport.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { PriceDraftImport.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { PriceDraftImport.builder()
-                        .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) },
-                new Object[] { PriceDraftImport.builder()
-                        .discounted(new com.commercetools.importapi.models.common.DiscountedPriceImpl()) },
-                new Object[] {
+                new Object[] { "channel",
+                        PriceDraftImport.builder()
+                                .channel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
+                new Object[] { "validFrom",
+                        PriceDraftImport.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        PriceDraftImport.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "custom",
+                        PriceDraftImport.builder()
+                                .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) },
+                new Object[] { "discounted",
+                        PriceDraftImport.builder()
+                                .discounted(new com.commercetools.importapi.models.common.DiscountedPriceImpl()) },
+                new Object[] { "tiers",
                         PriceDraftImport.builder()
                                 .tiers(Collections.singletonList(
                                     new com.commercetools.importapi.models.common.PriceTierImpl())) },
-                new Object[] { PriceDraftImport.builder().key("key") } };
+                new Object[] { "key", PriceDraftImport.builder().key("key") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productdrafts/ProductDraftImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productdrafts/ProductDraftImportTest.java
index a1b9f290f84..dee7f46f5e8 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productdrafts/ProductDraftImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productdrafts/ProductDraftImportTest.java
@@ -3,61 +3,62 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductDraftImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductDraftImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductDraftImportBuilder builder) {
         ProductDraftImport productDraftImport = builder.buildUnchecked();
         Assertions.assertThat(productDraftImport).isInstanceOf(ProductDraftImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductDraftImport.builder().key("key") },
-                new Object[] { ProductDraftImport.builder()
+        return new Object[][] { new Object[] { "key", ProductDraftImport.builder().key("key") },
+                new Object[] { "productType", ProductDraftImport.builder()
                         .productType(new com.commercetools.importapi.models.common.ProductTypeKeyReferenceImpl()) },
-                new Object[] { ProductDraftImport.builder()
-                        .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDraftImport.builder()
-                        .slug(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDraftImport.builder()
-                        .description(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDraftImport.builder()
-                        .categories(Collections.singletonList(
-                            new com.commercetools.importapi.models.common.CategoryKeyReferenceImpl())) },
-                new Object[] { ProductDraftImport.builder()
-                        .metaTitle(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDraftImport.builder()
-                        .metaDescription(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDraftImport.builder()
-                        .metaKeywords(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductDraftImport.builder()
+                new Object[] { "name",
+                        ProductDraftImport.builder()
+                                .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "slug",
+                        ProductDraftImport.builder()
+                                .slug(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
+                        ProductDraftImport.builder()
+                                .description(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "categories",
+                        ProductDraftImport.builder()
+                                .categories(Collections.singletonList(
+                                    new com.commercetools.importapi.models.common.CategoryKeyReferenceImpl())) },
+                new Object[] { "metaTitle",
+                        ProductDraftImport.builder()
+                                .metaTitle(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        ProductDraftImport.builder()
+                                .metaDescription(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        ProductDraftImport.builder()
+                                .metaKeywords(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "masterVariant", ProductDraftImport.builder()
                         .masterVariant(
                             new com.commercetools.importapi.models.productdrafts.ProductVariantDraftImportImpl()) },
-                new Object[] { ProductDraftImport.builder()
+                new Object[] { "variants", ProductDraftImport.builder()
                         .variants(Collections.singletonList(
                             new com.commercetools.importapi.models.productdrafts.ProductVariantDraftImportImpl())) },
-                new Object[] { ProductDraftImport.builder()
+                new Object[] { "taxCategory", ProductDraftImport.builder()
                         .taxCategory(new com.commercetools.importapi.models.common.TaxCategoryKeyReferenceImpl()) },
-                new Object[] { ProductDraftImport.builder()
-                        .searchKeywords(new com.commercetools.importapi.models.products.SearchKeywordsImpl()) },
-                new Object[] { ProductDraftImport.builder()
-                        .state(new com.commercetools.importapi.models.common.StateKeyReferenceImpl()) },
-                new Object[] { ProductDraftImport.builder().publish(true) },
-                new Object[] { ProductDraftImport.builder()
+                new Object[] { "searchKeywords",
+                        ProductDraftImport.builder()
+                                .searchKeywords(new com.commercetools.importapi.models.products.SearchKeywordsImpl()) },
+                new Object[] { "state",
+                        ProductDraftImport.builder()
+                                .state(new com.commercetools.importapi.models.common.StateKeyReferenceImpl()) },
+                new Object[] { "publish", ProductDraftImport.builder().publish(true) },
+                new Object[] { "priceMode", ProductDraftImport.builder()
                         .priceMode(
                             com.commercetools.importapi.models.common.ProductPriceModeEnum.findEnum("Embedded")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productdrafts/ProductVariantDraftImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productdrafts/ProductVariantDraftImportTest.java
index c65aa79ee58..5ae0c38fb9a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productdrafts/ProductVariantDraftImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productdrafts/ProductVariantDraftImportTest.java
@@ -3,40 +3,36 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantDraftImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantDraftImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantDraftImportBuilder builder) {
         ProductVariantDraftImport productVariantDraftImport = builder.buildUnchecked();
         Assertions.assertThat(productVariantDraftImport).isInstanceOf(ProductVariantDraftImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantDraftImport.builder().sku("sku") },
-                new Object[] { ProductVariantDraftImport.builder().key("key") },
-                new Object[] { ProductVariantDraftImport.builder()
-                        .prices(Collections.singletonList(
-                            new com.commercetools.importapi.models.productdrafts.PriceDraftImportImpl())) },
-                new Object[] { ProductVariantDraftImport.builder()
-                        .attributes(Collections.singletonList(
-                            new com.commercetools.importapi.models.productvariants.AttributeImpl())) },
-                new Object[] { ProductVariantDraftImport.builder()
-                        .images(Collections.singletonList(new com.commercetools.importapi.models.common.ImageImpl())) },
-                new Object[] { ProductVariantDraftImport.builder()
+        return new Object[][] { new Object[] { "sku", ProductVariantDraftImport.builder().sku("sku") },
+                new Object[] { "key", ProductVariantDraftImport.builder().key("key") },
+                new Object[] { "prices",
+                        ProductVariantDraftImport.builder()
+                                .prices(Collections.singletonList(
+                                    new com.commercetools.importapi.models.productdrafts.PriceDraftImportImpl())) },
+                new Object[] { "attributes",
+                        ProductVariantDraftImport.builder()
+                                .attributes(Collections.singletonList(
+                                    new com.commercetools.importapi.models.productvariants.AttributeImpl())) },
+                new Object[] { "images",
+                        ProductVariantDraftImport.builder()
+                                .images(Collections
+                                        .singletonList(new com.commercetools.importapi.models.common.ImageImpl())) },
+                new Object[] { "assets", ProductVariantDraftImport.builder()
                         .assets(
                             Collections.singletonList(new com.commercetools.importapi.models.common.AssetImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/CustomTokenizerTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/CustomTokenizerTest.java
index 80e479c03c1..c08e410e1e7 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/CustomTokenizerTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/CustomTokenizerTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomTokenizerTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomTokenizerBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomTokenizerBuilder builder) {
         CustomTokenizer customTokenizer = builder.buildUnchecked();
         Assertions.assertThat(customTokenizer).isInstanceOf(CustomTokenizer.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { CustomTokenizer.builder().inputs(Collections.singletonList("inputs")) } };
+                new Object[] { "inputs", CustomTokenizer.builder().inputs(Collections.singletonList("inputs")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/ProductImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/ProductImportTest.java
index 1719d6cb242..df9213165c3 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/ProductImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/ProductImportTest.java
@@ -3,55 +3,56 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductImportBuilder builder) {
         ProductImport productImport = builder.buildUnchecked();
         Assertions.assertThat(productImport).isInstanceOf(ProductImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductImport.builder().key("key") },
-                new Object[] { ProductImport.builder()
-                        .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductImport.builder()
+        return new Object[][] { new Object[] { "key", ProductImport.builder().key("key") },
+                new Object[] { "name",
+                        ProductImport.builder()
+                                .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "productType", ProductImport.builder()
                         .productType(new com.commercetools.importapi.models.common.ProductTypeKeyReferenceImpl()) },
-                new Object[] { ProductImport.builder()
-                        .slug(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductImport.builder()
-                        .description(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductImport.builder()
-                        .categories(Collections.singletonList(
-                            new com.commercetools.importapi.models.common.CategoryKeyReferenceImpl())) },
-                new Object[] { ProductImport.builder()
-                        .metaTitle(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductImport.builder()
-                        .metaDescription(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductImport.builder()
-                        .metaKeywords(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { ProductImport.builder()
+                new Object[] { "slug",
+                        ProductImport.builder()
+                                .slug(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
+                        ProductImport.builder()
+                                .description(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "categories",
+                        ProductImport.builder()
+                                .categories(Collections.singletonList(
+                                    new com.commercetools.importapi.models.common.CategoryKeyReferenceImpl())) },
+                new Object[] { "metaTitle",
+                        ProductImport.builder()
+                                .metaTitle(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaDescription",
+                        ProductImport.builder()
+                                .metaDescription(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "metaKeywords",
+                        ProductImport.builder()
+                                .metaKeywords(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "taxCategory", ProductImport.builder()
                         .taxCategory(new com.commercetools.importapi.models.common.TaxCategoryKeyReferenceImpl()) },
-                new Object[] { ProductImport.builder()
-                        .searchKeywords(new com.commercetools.importapi.models.products.SearchKeywordsImpl()) },
-                new Object[] { ProductImport.builder()
-                        .state(new com.commercetools.importapi.models.common.StateKeyReferenceImpl()) },
-                new Object[] { ProductImport.builder().publish(true) },
-                new Object[] { ProductImport.builder()
+                new Object[] { "searchKeywords",
+                        ProductImport.builder()
+                                .searchKeywords(new com.commercetools.importapi.models.products.SearchKeywordsImpl()) },
+                new Object[] { "state",
+                        ProductImport.builder()
+                                .state(new com.commercetools.importapi.models.common.StateKeyReferenceImpl()) },
+                new Object[] { "publish", ProductImport.builder().publish(true) },
+                new Object[] { "priceMode", ProductImport.builder()
                         .priceMode(
                             com.commercetools.importapi.models.common.ProductPriceModeEnum.findEnum("Embedded")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/SearchKeywordTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/SearchKeywordTest.java
index 3e6cf8fe0dc..606f46992d9 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/SearchKeywordTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/SearchKeywordTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.products;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchKeywordTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(SearchKeywordBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, SearchKeywordBuilder builder) {
         SearchKeyword searchKeyword = builder.buildUnchecked();
         Assertions.assertThat(searchKeyword).isInstanceOf(SearchKeyword.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { SearchKeyword.builder().text("text") },
-                new Object[] { SearchKeyword.builder()
+        return new Object[][] { new Object[] { "text", SearchKeyword.builder().text("text") },
+                new Object[] { "suggestTokenizer", SearchKeyword.builder()
                         .suggestTokenizer(new com.commercetools.importapi.models.products.SuggestTokenizerImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/SearchKeywordsTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/SearchKeywordsTest.java
index 849ab7936e9..fbf948383b7 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/SearchKeywordsTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/SearchKeywordsTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.products;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class SearchKeywordsTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/WhitespaceTokenizerTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/WhitespaceTokenizerTest.java
index 340564c0386..5f4c097f140 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/WhitespaceTokenizerTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/products/WhitespaceTokenizerTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.products;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class WhitespaceTokenizerTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeBooleanTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeBooleanTypeTest.java
index 9a99b6f0be1..7f72eddb5a2 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeBooleanTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeBooleanTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeBooleanTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeDateTimeTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeDateTimeTypeTest.java
index 71dce1223f0..bb47ccb56e2 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeDateTimeTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeDateTimeTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeDateTimeTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeDateTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeDateTypeTest.java
index 35df4d3e123..bf45ab53ffe 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeDateTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeDateTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeDateTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeDefinitionTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeDefinitionTest.java
index 8675a5fa70e..18acf07d01b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeDefinitionTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeDefinitionTest.java
@@ -1,46 +1,41 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeDefinitionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeDefinitionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeDefinitionBuilder builder) {
         AttributeDefinition attributeDefinition = builder.buildUnchecked();
         Assertions.assertThat(attributeDefinition).isInstanceOf(AttributeDefinition.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { AttributeDefinition.builder()
-                        .type(new com.commercetools.importapi.models.producttypes.AttributeTypeImpl()) },
-                new Object[] { AttributeDefinition.builder().name("name") },
-                new Object[] { AttributeDefinition.builder()
-                        .label(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { AttributeDefinition.builder().isRequired(true) },
-                new Object[] { AttributeDefinition.builder()
+                new Object[] { "type",
+                        AttributeDefinition.builder()
+                                .type(new com.commercetools.importapi.models.producttypes.AttributeTypeImpl()) },
+                new Object[] { "name", AttributeDefinition.builder().name("name") },
+                new Object[] { "label",
+                        AttributeDefinition.builder()
+                                .label(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "isRequired", AttributeDefinition.builder().isRequired(true) },
+                new Object[] { "attributeConstraint", AttributeDefinition.builder()
                         .attributeConstraint(
                             com.commercetools.importapi.models.producttypes.AttributeConstraintEnum.findEnum("None")) },
-                new Object[] { AttributeDefinition.builder()
-                        .inputTip(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] {
+                new Object[] { "inputTip",
+                        AttributeDefinition.builder()
+                                .inputTip(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "inputHint",
                         AttributeDefinition.builder()
                                 .inputHint(com.commercetools.importapi.models.producttypes.TextInputHint
                                         .findEnum("SingleLine")) },
-                new Object[] { AttributeDefinition.builder().isSearchable(true) } };
+                new Object[] { "isSearchable", AttributeDefinition.builder().isSearchable(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeEnumTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeEnumTypeTest.java
index a4cb549e824..a8de61455a9 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeEnumTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeEnumTypeTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeEnumTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeEnumTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeEnumTypeBuilder builder) {
         AttributeEnumType attributeEnumType = builder.buildUnchecked();
         Assertions.assertThat(attributeEnumType).isInstanceOf(AttributeEnumType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeEnumType.builder()
-                .values(Collections.singletonList(
-                    new com.commercetools.importapi.models.producttypes.AttributePlainEnumValueImpl())) } };
+        return new Object[][] { new Object[] { "values",
+                AttributeEnumType.builder()
+                        .values(Collections.singletonList(
+                            new com.commercetools.importapi.models.producttypes.AttributePlainEnumValueImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeLocalizableTextTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeLocalizableTextTypeTest.java
index 8f06f71f236..aec0f9e72a3 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeLocalizableTextTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeLocalizableTextTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeLocalizableTextTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeLocalizedEnumTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeLocalizedEnumTypeTest.java
index 24a1db9f444..946ce24d9c6 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeLocalizedEnumTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeLocalizedEnumTypeTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeLocalizedEnumTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeLocalizedEnumTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeLocalizedEnumTypeBuilder builder) {
         AttributeLocalizedEnumType attributeLocalizedEnumType = builder.buildUnchecked();
         Assertions.assertThat(attributeLocalizedEnumType).isInstanceOf(AttributeLocalizedEnumType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeLocalizedEnumType.builder()
-                .values(Collections.singletonList(
-                    new com.commercetools.importapi.models.producttypes.AttributeLocalizedEnumValueImpl())) } };
+        return new Object[][] { new Object[] { "values",
+                AttributeLocalizedEnumType.builder()
+                        .values(Collections.singletonList(
+                            new com.commercetools.importapi.models.producttypes.AttributeLocalizedEnumValueImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeLocalizedEnumValueTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeLocalizedEnumValueTest.java
index 1fe35506de8..73664acba0a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeLocalizedEnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeLocalizedEnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeLocalizedEnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeLocalizedEnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeLocalizedEnumValueBuilder builder) {
         AttributeLocalizedEnumValue attributeLocalizedEnumValue = builder.buildUnchecked();
         Assertions.assertThat(attributeLocalizedEnumValue).isInstanceOf(AttributeLocalizedEnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeLocalizedEnumValue.builder().key("key") },
-                new Object[] { AttributeLocalizedEnumValue.builder()
+        return new Object[][] { new Object[] { "key", AttributeLocalizedEnumValue.builder().key("key") },
+                new Object[] { "label", AttributeLocalizedEnumValue.builder()
                         .label(new com.commercetools.importapi.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeMoneyTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeMoneyTypeTest.java
index ff99e9a8c33..b5dd8adc97f 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeMoneyTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeMoneyTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeMoneyTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeNestedTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeNestedTypeTest.java
index 9e25736d426..2286b5bc76a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeNestedTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeNestedTypeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeNestedTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeNestedTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeNestedTypeBuilder builder) {
         AttributeNestedType attributeNestedType = builder.buildUnchecked();
         Assertions.assertThat(attributeNestedType).isInstanceOf(AttributeNestedType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeNestedType.builder()
+        return new Object[][] { new Object[] { "typeReference", AttributeNestedType.builder()
                 .typeReference(new com.commercetools.importapi.models.common.ProductTypeKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeNumberTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeNumberTypeTest.java
index 478e706893f..c977ac81e24 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeNumberTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeNumberTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeNumberTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributePlainEnumValueTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributePlainEnumValueTest.java
index 172d9b40387..3abfbdf720c 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributePlainEnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributePlainEnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributePlainEnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributePlainEnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributePlainEnumValueBuilder builder) {
         AttributePlainEnumValue attributePlainEnumValue = builder.buildUnchecked();
         Assertions.assertThat(attributePlainEnumValue).isInstanceOf(AttributePlainEnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributePlainEnumValue.builder().key("key") },
-                new Object[] { AttributePlainEnumValue.builder().label("label") } };
+        return new Object[][] { new Object[] { "key", AttributePlainEnumValue.builder().key("key") },
+                new Object[] { "label", AttributePlainEnumValue.builder().label("label") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeReferenceTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeReferenceTypeTest.java
index 8469bfe9689..5c2a0385af0 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeReferenceTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeReferenceTypeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeReferenceTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeReferenceTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeReferenceTypeBuilder builder) {
         AttributeReferenceType attributeReferenceType = builder.buildUnchecked();
         Assertions.assertThat(attributeReferenceType).isInstanceOf(AttributeReferenceType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeReferenceType.builder()
+        return new Object[][] { new Object[] { "referenceTypeId", AttributeReferenceType.builder()
                 .referenceTypeId(com.commercetools.importapi.models.common.ReferenceType.findEnum("cart")) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeSetTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeSetTypeTest.java
index a9d6fa28201..62f2821fbc2 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeSetTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeSetTypeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeSetTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(AttributeSetTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, AttributeSetTypeBuilder builder) {
         AttributeSetType attributeSetType = builder.buildUnchecked();
         Assertions.assertThat(attributeSetType).isInstanceOf(AttributeSetType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AttributeSetType.builder()
+        return new Object[][] { new Object[] { "elementType", AttributeSetType.builder()
                 .elementType(new com.commercetools.importapi.models.producttypes.AttributeTypeImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeTextTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeTextTypeTest.java
index fa354a1f4ee..b30ffa1cc12 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeTextTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeTextTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeTextTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeTimeTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeTimeTypeTest.java
index 7b86c17c647..276a7cd7e55 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeTimeTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/AttributeTimeTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.producttypes;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributeTimeTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/ProductTypeImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/ProductTypeImportTest.java
index 1a3969225ed..85915bb0d55 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/ProductTypeImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/producttypes/ProductTypeImportTest.java
@@ -3,35 +3,28 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductTypeImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductTypeImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductTypeImportBuilder builder) {
         ProductTypeImport productTypeImport = builder.buildUnchecked();
         Assertions.assertThat(productTypeImport).isInstanceOf(ProductTypeImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductTypeImport.builder().key("key") },
-                new Object[] { ProductTypeImport.builder().name("name") },
-                new Object[] { ProductTypeImport.builder().description("description") },
-                new Object[] { ProductTypeImport.builder()
-                        .attributes(Collections.singletonList(
-                            new com.commercetools.importapi.models.producttypes.AttributeDefinitionImpl())) } };
+        return new Object[][] { new Object[] { "key", ProductTypeImport.builder().key("key") },
+                new Object[] { "name", ProductTypeImport.builder().name("name") },
+                new Object[] { "description", ProductTypeImport.builder().description("description") },
+                new Object[] { "attributes",
+                        ProductTypeImport.builder()
+                                .attributes(Collections.singletonList(
+                                    new com.commercetools.importapi.models.producttypes.AttributeDefinitionImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/AttributesTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/AttributesTest.java
index 49c1f300c49..89bbc2fb076 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/AttributesTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/AttributesTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.productvariants;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class AttributesTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/BooleanAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/BooleanAttributeTest.java
index 1191bd762ce..a4bc332bfe4 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/BooleanAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/BooleanAttributeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.productvariants;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BooleanAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BooleanAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BooleanAttributeBuilder builder) {
         BooleanAttribute booleanAttribute = builder.buildUnchecked();
         Assertions.assertThat(booleanAttribute).isInstanceOf(BooleanAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BooleanAttribute.builder().value(true) } };
+        return new Object[][] { new Object[] { "value", BooleanAttribute.builder().value(true) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/BooleanSetAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/BooleanSetAttributeTest.java
index 235e292a9fe..a3e584fb39f 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/BooleanSetAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/BooleanSetAttributeTest.java
@@ -3,30 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class BooleanSetAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(BooleanSetAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, BooleanSetAttributeBuilder builder) {
         BooleanSetAttribute booleanSetAttribute = builder.buildUnchecked();
         Assertions.assertThat(booleanSetAttribute).isInstanceOf(BooleanSetAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { BooleanSetAttribute.builder().value(Collections.singletonList(true)) } };
+        return new Object[][] {
+                new Object[] { "value", BooleanSetAttribute.builder().value(Collections.singletonList(true)) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateAttributeTest.java
index 65db1be9770..14f5abffa37 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateAttributeTest.java
@@ -3,30 +3,23 @@
 
 import java.time.LocalDate;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DateAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DateAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DateAttributeBuilder builder) {
         DateAttribute dateAttribute = builder.buildUnchecked();
         Assertions.assertThat(dateAttribute).isInstanceOf(DateAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DateAttribute.builder().value(LocalDate.parse("2023-06-01")) } };
+        return new Object[][] {
+                new Object[] { "value", DateAttribute.builder().value(LocalDate.parse("2023-06-01")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateSetAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateSetAttributeTest.java
index 1fe4a4086a9..4ab6d89fdbc 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateSetAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateSetAttributeTest.java
@@ -4,30 +4,22 @@
 import java.time.LocalDate;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DateSetAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DateSetAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DateSetAttributeBuilder builder) {
         DateSetAttribute dateSetAttribute = builder.buildUnchecked();
         Assertions.assertThat(dateSetAttribute).isInstanceOf(DateSetAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "value",
                 DateSetAttribute.builder().value(Collections.singletonList(LocalDate.parse("2023-06-01"))) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateTimeAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateTimeAttributeTest.java
index c2c51ee8dcd..f07f6353a9d 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateTimeAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateTimeAttributeTest.java
@@ -3,31 +3,23 @@
 
 import java.time.ZonedDateTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DateTimeAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DateTimeAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DateTimeAttributeBuilder builder) {
         DateTimeAttribute dateTimeAttribute = builder.buildUnchecked();
         Assertions.assertThat(dateTimeAttribute).isInstanceOf(DateTimeAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { DateTimeAttribute.builder().value(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
+                new Object[] { "value", DateTimeAttribute.builder().value(ZonedDateTime.parse("2023-06-01T12:00Z")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateTimeSetAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateTimeSetAttributeTest.java
index c8a6b5dae0a..3912f09921f 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateTimeSetAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/DateTimeSetAttributeTest.java
@@ -4,30 +4,22 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class DateTimeSetAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(DateTimeSetAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, DateTimeSetAttributeBuilder builder) {
         DateTimeSetAttribute dateTimeSetAttribute = builder.buildUnchecked();
         Assertions.assertThat(dateTimeSetAttribute).isInstanceOf(DateTimeSetAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { DateTimeSetAttribute.builder()
+        return new Object[][] { new Object[] { "value", DateTimeSetAttribute.builder()
                 .value(Collections.singletonList(ZonedDateTime.parse("2023-06-01T12:00Z"))) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/EnumAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/EnumAttributeTest.java
index 349b70b84d7..09a14abc3ee 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/EnumAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/EnumAttributeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.productvariants;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EnumAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EnumAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EnumAttributeBuilder builder) {
         EnumAttribute enumAttribute = builder.buildUnchecked();
         Assertions.assertThat(enumAttribute).isInstanceOf(EnumAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EnumAttribute.builder().value("value") } };
+        return new Object[][] { new Object[] { "value", EnumAttribute.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/EnumSetAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/EnumSetAttributeTest.java
index 47b1b77beaa..f3e190d5aa6 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/EnumSetAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/EnumSetAttributeTest.java
@@ -3,30 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class EnumSetAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(EnumSetAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, EnumSetAttributeBuilder builder) {
         EnumSetAttribute enumSetAttribute = builder.buildUnchecked();
         Assertions.assertThat(enumSetAttribute).isInstanceOf(EnumSetAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { EnumSetAttribute.builder().value(Collections.singletonList("value")) } };
+        return new Object[][] {
+                new Object[] { "value", EnumSetAttribute.builder().value(Collections.singletonList("value")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableEnumAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableEnumAttributeTest.java
index fe4d0cd9207..7fe1ca519ff 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableEnumAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableEnumAttributeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.productvariants;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizableEnumAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocalizableEnumAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocalizableEnumAttributeBuilder builder) {
         LocalizableEnumAttribute localizableEnumAttribute = builder.buildUnchecked();
         Assertions.assertThat(localizableEnumAttribute).isInstanceOf(LocalizableEnumAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LocalizableEnumAttribute.builder().value("value") } };
+        return new Object[][] { new Object[] { "value", LocalizableEnumAttribute.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableEnumSetAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableEnumSetAttributeTest.java
index 53b80cae0d1..fc41b793b52 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableEnumSetAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableEnumSetAttributeTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizableEnumSetAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocalizableEnumSetAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocalizableEnumSetAttributeBuilder builder) {
         LocalizableEnumSetAttribute localizableEnumSetAttribute = builder.buildUnchecked();
         Assertions.assertThat(localizableEnumSetAttribute).isInstanceOf(LocalizableEnumSetAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] {
-                new Object[] { LocalizableEnumSetAttribute.builder().value(Collections.singletonList("value")) } };
+        return new Object[][] { new Object[] { "value",
+                LocalizableEnumSetAttribute.builder().value(Collections.singletonList("value")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableTextAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableTextAttributeTest.java
index 4b6a0061301..172d35dcd43 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableTextAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableTextAttributeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.productvariants;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizableTextAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocalizableTextAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocalizableTextAttributeBuilder builder) {
         LocalizableTextAttribute localizableTextAttribute = builder.buildUnchecked();
         Assertions.assertThat(localizableTextAttribute).isInstanceOf(LocalizableTextAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LocalizableTextAttribute.builder()
+        return new Object[][] { new Object[] { "value", LocalizableTextAttribute.builder()
                 .value(new com.commercetools.importapi.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableTextSetAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableTextSetAttributeTest.java
index 95de5bc40bb..4763e5810c0 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableTextSetAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/LocalizableTextSetAttributeTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class LocalizableTextSetAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(LocalizableTextSetAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, LocalizableTextSetAttributeBuilder builder) {
         LocalizableTextSetAttribute localizableTextSetAttribute = builder.buildUnchecked();
         Assertions.assertThat(localizableTextSetAttribute).isInstanceOf(LocalizableTextSetAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { LocalizableTextSetAttribute.builder()
+        return new Object[][] { new Object[] { "value", LocalizableTextSetAttribute.builder()
                 .value(
                     Collections.singletonList(new com.commercetools.importapi.models.common.LocalizedStringImpl())) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/MoneyAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/MoneyAttributeTest.java
index 35882f328de..cab7550b56f 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/MoneyAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/MoneyAttributeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.productvariants;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MoneyAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MoneyAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MoneyAttributeBuilder builder) {
         MoneyAttribute moneyAttribute = builder.buildUnchecked();
         Assertions.assertThat(moneyAttribute).isInstanceOf(MoneyAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "value",
                 MoneyAttribute.builder().value(new com.commercetools.importapi.models.common.TypedMoneyImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/MoneySetAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/MoneySetAttributeTest.java
index 33d1fc3219b..38518168291 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/MoneySetAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/MoneySetAttributeTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class MoneySetAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(MoneySetAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, MoneySetAttributeBuilder builder) {
         MoneySetAttribute moneySetAttribute = builder.buildUnchecked();
         Assertions.assertThat(moneySetAttribute).isInstanceOf(MoneySetAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { MoneySetAttribute.builder()
+        return new Object[][] { new Object[] { "value", MoneySetAttribute.builder()
                 .value(Collections.singletonList(new com.commercetools.importapi.models.common.TypedMoneyImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/NumberAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/NumberAttributeTest.java
index b60e960f6ae..93ff9b85de6 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/NumberAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/NumberAttributeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.productvariants;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class NumberAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(NumberAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, NumberAttributeBuilder builder) {
         NumberAttribute numberAttribute = builder.buildUnchecked();
         Assertions.assertThat(numberAttribute).isInstanceOf(NumberAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { NumberAttribute.builder().value(0.8275633) } };
+        return new Object[][] { new Object[] { "value", NumberAttribute.builder().value(0.8275633) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/NumberSetAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/NumberSetAttributeTest.java
index a5e8442bf32..fc0ec340391 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/NumberSetAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/NumberSetAttributeTest.java
@@ -3,31 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class NumberSetAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(NumberSetAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, NumberSetAttributeBuilder builder) {
         NumberSetAttribute numberSetAttribute = builder.buildUnchecked();
         Assertions.assertThat(numberSetAttribute).isInstanceOf(NumberSetAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] { NumberSetAttribute.builder().value(Collections.singletonList(0.8275633)) } };
+                new Object[] { "value", NumberSetAttribute.builder().value(Collections.singletonList(0.8275633)) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ProductVariantImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ProductVariantImportTest.java
index 8fca87a8467..c4f4c339bb8 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ProductVariantImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ProductVariantImportTest.java
@@ -3,41 +3,38 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantImportBuilder builder) {
         ProductVariantImport productVariantImport = builder.buildUnchecked();
         Assertions.assertThat(productVariantImport).isInstanceOf(ProductVariantImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantImport.builder().key("key") },
-                new Object[] { ProductVariantImport.builder().sku("sku") },
-                new Object[] { ProductVariantImport.builder().isMasterVariant(true) },
-                new Object[] { ProductVariantImport.builder()
-                        .attributes(Collections.singletonList(
-                            new com.commercetools.importapi.models.productvariants.AttributeImpl())) },
-                new Object[] { ProductVariantImport.builder()
-                        .images(Collections.singletonList(new com.commercetools.importapi.models.common.ImageImpl())) },
-                new Object[] { ProductVariantImport.builder()
-                        .assets(Collections.singletonList(new com.commercetools.importapi.models.common.AssetImpl())) },
-                new Object[] { ProductVariantImport.builder().staged(true) },
-                new Object[] { ProductVariantImport.builder()
+        return new Object[][] { new Object[] { "key", ProductVariantImport.builder().key("key") },
+                new Object[] { "sku", ProductVariantImport.builder().sku("sku") },
+                new Object[] { "isMasterVariant", ProductVariantImport.builder().isMasterVariant(true) },
+                new Object[] { "attributes",
+                        ProductVariantImport.builder()
+                                .attributes(Collections.singletonList(
+                                    new com.commercetools.importapi.models.productvariants.AttributeImpl())) },
+                new Object[] { "images",
+                        ProductVariantImport.builder()
+                                .images(Collections
+                                        .singletonList(new com.commercetools.importapi.models.common.ImageImpl())) },
+                new Object[] { "assets",
+                        ProductVariantImport.builder()
+                                .assets(Collections
+                                        .singletonList(new com.commercetools.importapi.models.common.AssetImpl())) },
+                new Object[] { "staged", ProductVariantImport.builder().staged(true) },
+                new Object[] { "product", ProductVariantImport.builder()
                         .product(new com.commercetools.importapi.models.common.ProductKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ProductVariantPatchTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ProductVariantPatchTest.java
index 461c544e861..c9a9a21645d 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ProductVariantPatchTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ProductVariantPatchTest.java
@@ -1,35 +1,31 @@
 
 package com.commercetools.importapi.models.productvariants;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ProductVariantPatchTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ProductVariantPatchBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ProductVariantPatchBuilder builder) {
         ProductVariantPatch productVariantPatch = builder.buildUnchecked();
         Assertions.assertThat(productVariantPatch).isInstanceOf(ProductVariantPatch.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ProductVariantPatch.builder()
-                .productVariant(new com.commercetools.importapi.models.common.ProductVariantKeyReferenceImpl()) },
-                new Object[] { ProductVariantPatch.builder()
-                        .attributes(new com.commercetools.importapi.models.productvariants.AttributesImpl()) },
-                new Object[] { ProductVariantPatch.builder().staged(true) },
-                new Object[] { ProductVariantPatch.builder()
+        return new Object[][] {
+                new Object[] { "productVariant",
+                        ProductVariantPatch.builder()
+                                .productVariant(
+                                    new com.commercetools.importapi.models.common.ProductVariantKeyReferenceImpl()) },
+                new Object[] { "attributes",
+                        ProductVariantPatch.builder()
+                                .attributes(new com.commercetools.importapi.models.productvariants.AttributesImpl()) },
+                new Object[] { "staged", ProductVariantPatch.builder().staged(true) },
+                new Object[] { "product", ProductVariantPatch.builder()
                         .product(new com.commercetools.importapi.models.common.ProductKeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ReferenceAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ReferenceAttributeTest.java
index 05c3fe35d85..059534ef813 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ReferenceAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ReferenceAttributeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.productvariants;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReferenceAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReferenceAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReferenceAttributeBuilder builder) {
         ReferenceAttribute referenceAttribute = builder.buildUnchecked();
         Assertions.assertThat(referenceAttribute).isInstanceOf(ReferenceAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReferenceAttribute.builder()
+        return new Object[][] { new Object[] { "value", ReferenceAttribute.builder()
                 .value(new com.commercetools.importapi.models.common.KeyReferenceImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ReferenceSetAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ReferenceSetAttributeTest.java
index 6f250bb005e..369c45e336c 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ReferenceSetAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/ReferenceSetAttributeTest.java
@@ -3,30 +3,22 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class ReferenceSetAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(ReferenceSetAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, ReferenceSetAttributeBuilder builder) {
         ReferenceSetAttribute referenceSetAttribute = builder.buildUnchecked();
         Assertions.assertThat(referenceSetAttribute).isInstanceOf(ReferenceSetAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { ReferenceSetAttribute.builder()
+        return new Object[][] { new Object[] { "value", ReferenceSetAttribute.builder()
                 .value(Collections.singletonList(new com.commercetools.importapi.models.common.KeyReferenceImpl())) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TextAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TextAttributeTest.java
index f306017084c..218c397d947 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TextAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TextAttributeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.productvariants;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TextAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TextAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TextAttributeBuilder builder) {
         TextAttribute textAttribute = builder.buildUnchecked();
         Assertions.assertThat(textAttribute).isInstanceOf(TextAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TextAttribute.builder().value("value") } };
+        return new Object[][] { new Object[] { "value", TextAttribute.builder().value("value") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TextSetAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TextSetAttributeTest.java
index e75d26d7b78..9ec1e30c6b6 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TextSetAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TextSetAttributeTest.java
@@ -3,30 +3,23 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TextSetAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TextSetAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TextSetAttributeBuilder builder) {
         TextSetAttribute textSetAttribute = builder.buildUnchecked();
         Assertions.assertThat(textSetAttribute).isInstanceOf(TextSetAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TextSetAttribute.builder().value(Collections.singletonList("value")) } };
+        return new Object[][] {
+                new Object[] { "value", TextSetAttribute.builder().value(Collections.singletonList("value")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TimeAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TimeAttributeTest.java
index 0fbe2b09509..745468f01ca 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TimeAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TimeAttributeTest.java
@@ -3,30 +3,22 @@
 
 import java.time.LocalTime;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TimeAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TimeAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TimeAttributeBuilder builder) {
         TimeAttribute timeAttribute = builder.buildUnchecked();
         Assertions.assertThat(timeAttribute).isInstanceOf(TimeAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TimeAttribute.builder().value(LocalTime.parse("12:00")) } };
+        return new Object[][] { new Object[] { "value", TimeAttribute.builder().value(LocalTime.parse("12:00")) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TimeSetAttributeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TimeSetAttributeTest.java
index 8264164328b..fc660ad43eb 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TimeSetAttributeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/productvariants/TimeSetAttributeTest.java
@@ -4,30 +4,22 @@
 import java.time.LocalTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TimeSetAttributeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TimeSetAttributeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TimeSetAttributeBuilder builder) {
         TimeSetAttribute timeSetAttribute = builder.buildUnchecked();
         Assertions.assertThat(timeSetAttribute).isInstanceOf(TimeSetAttribute.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] {
+        return new Object[][] { new Object[] { "value",
                 TimeSetAttribute.builder().value(Collections.singletonList(LocalTime.parse("12:00"))) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/standalone_prices/StandalonePriceImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/standalone_prices/StandalonePriceImportTest.java
index 299c1133684..2caea8ef9db 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/standalone_prices/StandalonePriceImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/standalone_prices/StandalonePriceImportTest.java
@@ -4,47 +4,44 @@
 import java.time.ZonedDateTime;
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class StandalonePriceImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(StandalonePriceImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, StandalonePriceImportBuilder builder) {
         StandalonePriceImport standalonePriceImport = builder.buildUnchecked();
         Assertions.assertThat(standalonePriceImport).isInstanceOf(StandalonePriceImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { StandalonePriceImport.builder().key("key") },
-                new Object[] { StandalonePriceImport.builder().sku("sku") },
-                new Object[] { StandalonePriceImport.builder()
-                        .value(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
-                new Object[] { StandalonePriceImport.builder().country("country") },
-                new Object[] { StandalonePriceImport.builder()
+        return new Object[][] { new Object[] { "key", StandalonePriceImport.builder().key("key") },
+                new Object[] { "sku", StandalonePriceImport.builder().sku("sku") },
+                new Object[] { "value",
+                        StandalonePriceImport.builder()
+                                .value(new com.commercetools.importapi.models.common.TypedMoneyImpl()) },
+                new Object[] { "country", StandalonePriceImport.builder().country("country") },
+                new Object[] { "customerGroup", StandalonePriceImport.builder()
                         .customerGroup(new com.commercetools.importapi.models.common.CustomerGroupKeyReferenceImpl()) },
-                new Object[] { StandalonePriceImport.builder()
-                        .channel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
-                new Object[] { StandalonePriceImport.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] { StandalonePriceImport.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
-                new Object[] {
+                new Object[] { "channel",
+                        StandalonePriceImport.builder()
+                                .channel(new com.commercetools.importapi.models.common.ChannelKeyReferenceImpl()) },
+                new Object[] { "validFrom",
+                        StandalonePriceImport.builder().validFrom(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "validUntil",
+                        StandalonePriceImport.builder().validUntil(ZonedDateTime.parse("2023-06-01T12:00Z")) },
+                new Object[] { "tiers",
                         StandalonePriceImport.builder()
                                 .tiers(Collections.singletonList(
                                     new com.commercetools.importapi.models.common.PriceTierImpl())) },
-                new Object[] { StandalonePriceImport.builder()
-                        .discounted(new com.commercetools.importapi.models.common.DiscountedPriceImpl()) },
-                new Object[] { StandalonePriceImport.builder()
+                new Object[] { "discounted",
+                        StandalonePriceImport.builder()
+                                .discounted(new com.commercetools.importapi.models.common.DiscountedPriceImpl()) },
+                new Object[] { "custom", StandalonePriceImport.builder()
                         .custom(new com.commercetools.importapi.models.customfields.CustomImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldBooleanTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldBooleanTypeTest.java
index 8733073c7fd..d2b5398472c 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldBooleanTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldBooleanTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldBooleanTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldDateTimeTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldDateTimeTypeTest.java
index aca7fe669d3..136242ebd52 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldDateTimeTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldDateTimeTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldDateTimeTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldDateTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldDateTypeTest.java
index 9137cb96db0..6b4fc963952 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldDateTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldDateTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldDateTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldEnumTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldEnumTypeTest.java
index 1a541d8a9ec..6ed8cd9ec68 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldEnumTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldEnumTypeTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldEnumTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldEnumTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldEnumTypeBuilder builder) {
         CustomFieldEnumType customFieldEnumType = builder.buildUnchecked();
         Assertions.assertThat(customFieldEnumType).isInstanceOf(CustomFieldEnumType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomFieldEnumType.builder()
-                .values(Collections
-                        .singletonList(new com.commercetools.importapi.models.types.CustomFieldEnumValueImpl())) } };
+        return new Object[][] { new Object[] { "values",
+                CustomFieldEnumType.builder()
+                        .values(Collections.singletonList(
+                            new com.commercetools.importapi.models.types.CustomFieldEnumValueImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldEnumValueTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldEnumValueTest.java
index f3efd687007..97d0fdf9153 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldEnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldEnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldEnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldEnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldEnumValueBuilder builder) {
         CustomFieldEnumValue customFieldEnumValue = builder.buildUnchecked();
         Assertions.assertThat(customFieldEnumValue).isInstanceOf(CustomFieldEnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomFieldEnumValue.builder().key("key") },
-                new Object[] { CustomFieldEnumValue.builder().label("label") } };
+        return new Object[][] { new Object[] { "key", CustomFieldEnumValue.builder().key("key") },
+                new Object[] { "label", CustomFieldEnumValue.builder().label("label") } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldLocalizedEnumTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldLocalizedEnumTypeTest.java
index 474b289f63d..f86d44a24f2 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldLocalizedEnumTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldLocalizedEnumTypeTest.java
@@ -3,32 +3,25 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldLocalizedEnumTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldLocalizedEnumTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldLocalizedEnumTypeBuilder builder) {
         CustomFieldLocalizedEnumType customFieldLocalizedEnumType = builder.buildUnchecked();
         Assertions.assertThat(customFieldLocalizedEnumType).isInstanceOf(CustomFieldLocalizedEnumType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomFieldLocalizedEnumType.builder()
-                .values(Collections.singletonList(
-                    new com.commercetools.importapi.models.types.CustomFieldLocalizedEnumValueImpl())) } };
+        return new Object[][] { new Object[] { "values",
+                CustomFieldLocalizedEnumType.builder()
+                        .values(Collections.singletonList(
+                            new com.commercetools.importapi.models.types.CustomFieldLocalizedEnumValueImpl())) } };
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldLocalizedEnumValueTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldLocalizedEnumValueTest.java
index 15983a098aa..db892d9bb57 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldLocalizedEnumValueTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldLocalizedEnumValueTest.java
@@ -1,31 +1,23 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldLocalizedEnumValueTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldLocalizedEnumValueBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldLocalizedEnumValueBuilder builder) {
         CustomFieldLocalizedEnumValue customFieldLocalizedEnumValue = builder.buildUnchecked();
         Assertions.assertThat(customFieldLocalizedEnumValue).isInstanceOf(CustomFieldLocalizedEnumValue.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomFieldLocalizedEnumValue.builder().key("key") },
-                new Object[] { CustomFieldLocalizedEnumValue.builder()
+        return new Object[][] { new Object[] { "key", CustomFieldLocalizedEnumValue.builder().key("key") },
+                new Object[] { "label", CustomFieldLocalizedEnumValue.builder()
                         .label(new com.commercetools.importapi.models.common.LocalizedStringImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldLocalizedStringTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldLocalizedStringTypeTest.java
index 92408f1e6bc..951dbf0e5a6 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldLocalizedStringTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldLocalizedStringTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldLocalizedStringTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldMoneyTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldMoneyTypeTest.java
index e4b1cd1768f..4362a827b90 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldMoneyTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldMoneyTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldMoneyTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldNumberTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldNumberTypeTest.java
index 712877a8928..f6cfcc74e32 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldNumberTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldNumberTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldNumberTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldReferenceTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldReferenceTypeTest.java
index 0d5e9557ad1..206edb29416 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldReferenceTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldReferenceTypeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldReferenceTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldReferenceTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldReferenceTypeBuilder builder) {
         CustomFieldReferenceType customFieldReferenceType = builder.buildUnchecked();
         Assertions.assertThat(customFieldReferenceType).isInstanceOf(CustomFieldReferenceType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomFieldReferenceType.builder()
+        return new Object[][] { new Object[] { "referenceTypeId", CustomFieldReferenceType.builder()
                 .referenceTypeId(
                     com.commercetools.importapi.models.types.CustomFieldReferenceValue.findEnum("associate-role")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldSetTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldSetTypeTest.java
index f6f9ca7766a..09797558602 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldSetTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldSetTypeTest.java
@@ -1,30 +1,22 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldSetTypeTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(CustomFieldSetTypeBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, CustomFieldSetTypeBuilder builder) {
         CustomFieldSetType customFieldSetType = builder.buildUnchecked();
         Assertions.assertThat(customFieldSetType).isInstanceOf(CustomFieldSetType.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { CustomFieldSetType.builder()
+        return new Object[][] { new Object[] { "elementType", CustomFieldSetType.builder()
                 .elementType(new com.commercetools.importapi.models.types.FieldTypeImpl()) } };
     }
 
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldStringTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldStringTypeTest.java
index 141446161e3..5d6efda4f9a 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldStringTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldStringTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldStringTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldTimeTypeTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldTimeTypeTest.java
index 146e5a33861..a61c6e2586b 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldTimeTypeTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/CustomFieldTimeTypeTest.java
@@ -1,13 +1,6 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
-import org.junit.jupiter.api.extension.ExtendWith;
-
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class CustomFieldTimeTypeTest {
 
 }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/FieldDefinitionTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/FieldDefinitionTest.java
index 10c1ccfb6a8..cdb86bee863 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/FieldDefinitionTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/FieldDefinitionTest.java
@@ -1,37 +1,30 @@
 
 package com.commercetools.importapi.models.types;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class FieldDefinitionTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(FieldDefinitionBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, FieldDefinitionBuilder builder) {
         FieldDefinition fieldDefinition = builder.buildUnchecked();
         Assertions.assertThat(fieldDefinition).isInstanceOf(FieldDefinition.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
         return new Object[][] {
-                new Object[] {
+                new Object[] { "type",
                         FieldDefinition.builder().type(new com.commercetools.importapi.models.types.FieldTypeImpl()) },
-                new Object[] { FieldDefinition.builder().name("name") },
-                new Object[] { FieldDefinition.builder()
-                        .label(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { FieldDefinition.builder().required(true) },
-                new Object[] { FieldDefinition.builder()
+                new Object[] { "name", FieldDefinition.builder().name("name") },
+                new Object[] { "label",
+                        FieldDefinition.builder()
+                                .label(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "required", FieldDefinition.builder().required(true) },
+                new Object[] { "inputHint", FieldDefinition.builder()
                         .inputHint(
                             com.commercetools.importapi.models.types.TypeTextInputHint.findEnum("SingleLine")) } };
     }
diff --git a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/TypeImportTest.java b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/TypeImportTest.java
index 45808e35fd9..762975a5260 100644
--- a/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/TypeImportTest.java
+++ b/commercetools/commercetools-sdk-java-importapi/src/test/java-generated/com/commercetools/importapi/models/types/TypeImportTest.java
@@ -3,40 +3,36 @@
 
 import java.util.Collections;
 
-import com.tngtech.junit.dataprovider.DataProvider;
-import com.tngtech.junit.dataprovider.DataProviderExtension;
-import com.tngtech.junit.dataprovider.UseDataProvider;
-import com.tngtech.junit.dataprovider.UseDataProviderExtension;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestTemplate;
-import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@ExtendWith(UseDataProviderExtension.class)
-@ExtendWith(DataProviderExtension.class)
 public class TypeImportTest {
 
-    @TestTemplate
-    @UseDataProvider("objectBuilder")
-    public void buildUnchecked(TypeImportBuilder builder) {
+    @ParameterizedTest(name = "#{index} with {0}")
+    @MethodSource("objectBuilder")
+    public void buildUnchecked(String name, TypeImportBuilder builder) {
         TypeImport typeImport = builder.buildUnchecked();
         Assertions.assertThat(typeImport).isInstanceOf(TypeImport.class);
     }
 
-    @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { TypeImport.builder().key("key") },
-                new Object[] { TypeImport.builder()
-                        .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { TypeImport.builder()
-                        .description(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
-                new Object[] { TypeImport.builder()
-                        .resourceTypeIds(Collections.singletonList(
-                            com.commercetools.importapi.models.types.ResourceTypeId.findEnum("address"))) },
-                new Object[] { TypeImport.builder()
-                        .fieldDefinitions(Collections
-                                .singletonList(new com.commercetools.importapi.models.types.FieldDefinitionImpl())) } };
+        return new Object[][] { new Object[] { "key", TypeImport.builder().key("key") },
+                new Object[] { "name",
+                        TypeImport.builder()
+                                .name(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "description",
+                        TypeImport.builder()
+                                .description(new com.commercetools.importapi.models.common.LocalizedStringImpl()) },
+                new Object[] { "resourceTypeIds",
+                        TypeImport.builder()
+                                .resourceTypeIds(Collections.singletonList(
+                                    com.commercetools.importapi.models.types.ResourceTypeId.findEnum("address"))) },
+                new Object[] { "fieldDefinitions",
+                        TypeImport.builder()
+                                .fieldDefinitions(Collections.singletonList(
+                                    new com.commercetools.importapi.models.types.FieldDefinitionImpl())) } };
     }
 
     @Test
diff --git a/licenses/commercetools-apachehttp-client/index.json b/licenses/commercetools-apachehttp-client/index.json
index f78af155def..a647333aaa2 100644
--- a/licenses/commercetools-apachehttp-client/index.json
+++ b/licenses/commercetools-apachehttp-client/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -142,7 +142,7 @@
         },
         {
             "moduleName": "org.apache.httpcomponents.client5:httpclient5",
-            "moduleVersion": "5.4.2",
+            "moduleVersion": "5.4.4",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -152,7 +152,7 @@
         },
         {
             "moduleName": "org.apache.httpcomponents.core5:httpcore5",
-            "moduleVersion": "5.3.3",
+            "moduleVersion": "5.3.4",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -162,7 +162,7 @@
         },
         {
             "moduleName": "org.apache.httpcomponents.core5:httpcore5-h2",
-            "moduleVersion": "5.3.3",
+            "moduleVersion": "5.3.4",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
diff --git a/licenses/commercetools-async-http-client/index.json b/licenses/commercetools-async-http-client/index.json
index 0cc868cc462..ecb4ccdb7c1 100644
--- a/licenses/commercetools-async-http-client/index.json
+++ b/licenses/commercetools-async-http-client/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -141,7 +141,7 @@
         },
         {
             "moduleName": "io.netty:netty-buffer",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -154,7 +154,33 @@
         },
         {
             "moduleName": "io.netty:netty-codec",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-base",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-compression",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -167,7 +193,33 @@
         },
         {
             "moduleName": "io.netty:netty-codec-http",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-marshalling",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-protobuf",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -180,7 +232,7 @@
         },
         {
             "moduleName": "io.netty:netty-codec-socks",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -193,7 +245,7 @@
         },
         {
             "moduleName": "io.netty:netty-common",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -206,7 +258,7 @@
         },
         {
             "moduleName": "io.netty:netty-handler",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -219,7 +271,7 @@
         },
         {
             "moduleName": "io.netty:netty-handler-proxy",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -232,7 +284,7 @@
         },
         {
             "moduleName": "io.netty:netty-resolver",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -245,7 +297,7 @@
         },
         {
             "moduleName": "io.netty:netty-transport",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -284,7 +336,7 @@
         },
         {
             "moduleName": "io.netty:netty-transport-native-unix-common",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
diff --git a/licenses/commercetools-graphql-api/index.json b/licenses/commercetools-graphql-api/index.json
index 9e1126895b5..2cefe76e483 100644
--- a/licenses/commercetools-graphql-api/index.json
+++ b/licenses/commercetools-graphql-api/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -216,7 +216,7 @@
         },
         {
             "moduleName": "org.javamoney.moneta:moneta-core",
-            "moduleVersion": "1.4.4",
+            "moduleVersion": "1.4.5",
             "moduleUrls": [
                 "http://javamoney.org",
                 "http://www.javamoney.org"
diff --git a/licenses/commercetools-http-client/index.json b/licenses/commercetools-http-client/index.json
index 0cc868cc462..ecb4ccdb7c1 100644
--- a/licenses/commercetools-http-client/index.json
+++ b/licenses/commercetools-http-client/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -141,7 +141,7 @@
         },
         {
             "moduleName": "io.netty:netty-buffer",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -154,7 +154,33 @@
         },
         {
             "moduleName": "io.netty:netty-codec",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-base",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-compression",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -167,7 +193,33 @@
         },
         {
             "moduleName": "io.netty:netty-codec-http",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-marshalling",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-protobuf",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -180,7 +232,7 @@
         },
         {
             "moduleName": "io.netty:netty-codec-socks",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -193,7 +245,7 @@
         },
         {
             "moduleName": "io.netty:netty-common",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -206,7 +258,7 @@
         },
         {
             "moduleName": "io.netty:netty-handler",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -219,7 +271,7 @@
         },
         {
             "moduleName": "io.netty:netty-handler-proxy",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -232,7 +284,7 @@
         },
         {
             "moduleName": "io.netty:netty-resolver",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -245,7 +297,7 @@
         },
         {
             "moduleName": "io.netty:netty-transport",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -284,7 +336,7 @@
         },
         {
             "moduleName": "io.netty:netty-transport-native-unix-common",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
diff --git a/licenses/commercetools-javanet-client/index.json b/licenses/commercetools-javanet-client/index.json
index 60b6b659303..24134eee477 100644
--- a/licenses/commercetools-javanet-client/index.json
+++ b/licenses/commercetools-javanet-client/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
diff --git a/licenses/commercetools-money/index.json b/licenses/commercetools-money/index.json
index 04bcb4848a6..896d5a6de44 100644
--- a/licenses/commercetools-money/index.json
+++ b/licenses/commercetools-money/index.json
@@ -38,7 +38,7 @@
         },
         {
             "moduleName": "org.javamoney.moneta:moneta-core",
-            "moduleVersion": "1.4.4",
+            "moduleVersion": "1.4.5",
             "moduleUrls": [
                 "http://javamoney.org",
                 "http://www.javamoney.org"
diff --git a/licenses/commercetools-monitoring-datadog/index.json b/licenses/commercetools-monitoring-datadog/index.json
index ecfe68c22aa..6ab3d42fece 100644
--- a/licenses/commercetools-monitoring-datadog/index.json
+++ b/licenses/commercetools-monitoring-datadog/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.datadoghq:datadog-api-client",
-            "moduleVersion": "2.33.1",
+            "moduleVersion": "2.34.1",
             "moduleUrls": [
                 "https://github.com/DataDog/datadog-api-client-java"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.datadoghq:java-dogstatsd-client",
-            "moduleVersion": "4.4.3",
+            "moduleVersion": "4.4.4",
             "moduleUrls": [
                 "https://github.com/DataDog/java-dogstatsd-client"
             ],
@@ -32,7 +32,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -45,7 +45,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -58,7 +58,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -71,7 +71,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -84,7 +84,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-base"
             ],
diff --git a/licenses/commercetools-monitoring-newrelic/index.json b/licenses/commercetools-monitoring-newrelic/index.json
index 2248086f096..ae867fe8009 100644
--- a/licenses/commercetools-monitoring-newrelic/index.json
+++ b/licenses/commercetools-monitoring-newrelic/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -67,7 +67,7 @@
         },
         {
             "moduleName": "com.newrelic.agent.java:newrelic-api",
-            "moduleVersion": "8.19.0",
+            "moduleVersion": "8.20.0",
             "moduleUrls": [
                 "https://github.com/newrelic/newrelic-java-agent"
             ],
diff --git a/licenses/commercetools-monitoring-opentelemetry/index.json b/licenses/commercetools-monitoring-opentelemetry/index.json
index 52b6bed2958..9615398edb8 100644
--- a/licenses/commercetools-monitoring-opentelemetry/index.json
+++ b/licenses/commercetools-monitoring-opentelemetry/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -94,7 +94,7 @@
         },
         {
             "moduleName": "io.opentelemetry:opentelemetry-api",
-            "moduleVersion": "1.48.0",
+            "moduleVersion": "1.49.0",
             "moduleUrls": [
                 "https://github.com/open-telemetry/opentelemetry-java"
             ],
@@ -107,7 +107,7 @@
         },
         {
             "moduleName": "io.opentelemetry:opentelemetry-context",
-            "moduleVersion": "1.48.0",
+            "moduleVersion": "1.49.0",
             "moduleUrls": [
                 "https://github.com/open-telemetry/opentelemetry-java"
             ],
diff --git a/licenses/commercetools-okhttp-client3/index.json b/licenses/commercetools-okhttp-client3/index.json
index 365c9186428..6081b3a739b 100644
--- a/licenses/commercetools-okhttp-client3/index.json
+++ b/licenses/commercetools-okhttp-client3/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -90,11 +90,11 @@
         },
         {
             "moduleName": "com.squareup.okio:okio",
-            "moduleVersion": "3.10.2"
+            "moduleVersion": "3.11.0"
         },
         {
             "moduleName": "com.squareup.okio:okio-jvm",
-            "moduleVersion": "3.10.2",
+            "moduleVersion": "3.11.0",
             "moduleUrls": [
                 "https://github.com/square/okio/"
             ],
@@ -156,7 +156,7 @@
         },
         {
             "moduleName": "org.jetbrains.kotlin:kotlin-stdlib",
-            "moduleVersion": "2.1.0",
+            "moduleVersion": "2.1.20",
             "moduleUrls": [
                 "https://kotlinlang.org/"
             ],
diff --git a/licenses/commercetools-okhttp-client4/index.json b/licenses/commercetools-okhttp-client4/index.json
index b3617f8d6f1..c964814ad3f 100644
--- a/licenses/commercetools-okhttp-client4/index.json
+++ b/licenses/commercetools-okhttp-client4/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -93,11 +93,11 @@
         },
         {
             "moduleName": "com.squareup.okio:okio",
-            "moduleVersion": "3.10.2"
+            "moduleVersion": "3.11.0"
         },
         {
             "moduleName": "com.squareup.okio:okio-jvm",
-            "moduleVersion": "3.10.2",
+            "moduleVersion": "3.11.0",
             "moduleUrls": [
                 "https://github.com/square/okio/"
             ],
@@ -159,7 +159,7 @@
         },
         {
             "moduleName": "org.jetbrains.kotlin:kotlin-stdlib",
-            "moduleVersion": "2.1.0",
+            "moduleVersion": "2.1.20",
             "moduleUrls": [
                 "https://kotlinlang.org/"
             ],
diff --git a/licenses/commercetools-reactornetty-client/index.json b/licenses/commercetools-reactornetty-client/index.json
index aada023dfc8..4a8d2d578a2 100644
--- a/licenses/commercetools-reactornetty-client/index.json
+++ b/licenses/commercetools-reactornetty-client/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -315,7 +315,7 @@
         },
         {
             "moduleName": "io.projectreactor.netty:reactor-netty-core",
-            "moduleVersion": "1.2.4",
+            "moduleVersion": "1.2.5",
             "moduleUrls": [
                 "https://github.com/reactor/reactor-netty"
             ],
@@ -328,7 +328,7 @@
         },
         {
             "moduleName": "io.projectreactor.netty:reactor-netty-http",
-            "moduleVersion": "1.2.4",
+            "moduleVersion": "1.2.5",
             "moduleUrls": [
                 "https://github.com/reactor/reactor-netty"
             ],
@@ -341,7 +341,7 @@
         },
         {
             "moduleName": "io.projectreactor:reactor-core",
-            "moduleVersion": "3.7.4",
+            "moduleVersion": "3.7.5",
             "moduleUrls": [
                 "https://github.com/reactor/reactor-core"
             ],
diff --git a/licenses/commercetools-sdk-compat-v1/index.json b/licenses/commercetools-sdk-compat-v1/index.json
index f3211463252..5c51acfe0a6 100644
--- a/licenses/commercetools-sdk-compat-v1/index.json
+++ b/licenses/commercetools-sdk-compat-v1/index.json
@@ -72,7 +72,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -85,7 +85,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -98,7 +98,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -111,7 +111,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-dataformats-binary"
             ],
@@ -124,7 +124,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -137,7 +137,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.module:jackson-module-parameter-names",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names"
             ],
@@ -243,7 +243,7 @@
         },
         {
             "moduleName": "io.netty:netty-buffer",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -256,7 +256,33 @@
         },
         {
             "moduleName": "io.netty:netty-codec",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-base",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-compression",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -269,7 +295,33 @@
         },
         {
             "moduleName": "io.netty:netty-codec-http",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-marshalling",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-protobuf",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -282,7 +334,7 @@
         },
         {
             "moduleName": "io.netty:netty-common",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -295,7 +347,7 @@
         },
         {
             "moduleName": "io.netty:netty-handler",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -308,7 +360,7 @@
         },
         {
             "moduleName": "io.netty:netty-resolver",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -321,7 +373,7 @@
         },
         {
             "moduleName": "io.netty:netty-transport",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -347,7 +399,7 @@
         },
         {
             "moduleName": "io.netty:netty-transport-native-unix-common",
-            "moduleVersion": "4.1.119.Final",
+            "moduleVersion": "4.2.0.Final",
             "moduleUrls": [
                 "https://netty.io/"
             ],
@@ -449,7 +501,7 @@
         },
         {
             "moduleName": "org.apache.commons:commons-text",
-            "moduleVersion": "1.13.0",
+            "moduleVersion": "1.13.1",
             "moduleUrls": [
                 "https://commons.apache.org/proper/commons-text"
             ],
@@ -565,7 +617,7 @@
         },
         {
             "moduleName": "org.javamoney.moneta:moneta-core",
-            "moduleVersion": "1.4.4",
+            "moduleVersion": "1.4.5",
             "moduleUrls": [
                 "http://javamoney.org",
                 "http://www.javamoney.org"
diff --git a/licenses/commercetools-sdk-java-api/index.json b/licenses/commercetools-sdk-java-api/index.json
index ba744206b98..c7f7472f4cc 100644
--- a/licenses/commercetools-sdk-java-api/index.json
+++ b/licenses/commercetools-sdk-java-api/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -165,7 +165,7 @@
         },
         {
             "moduleName": "org.javamoney.moneta:moneta-core",
-            "moduleVersion": "1.4.4",
+            "moduleVersion": "1.4.5",
             "moduleUrls": [
                 "http://javamoney.org",
                 "http://www.javamoney.org"
diff --git a/licenses/commercetools-sdk-java-history/index.json b/licenses/commercetools-sdk-java-history/index.json
index b04bab874c6..ee273a505d7 100644
--- a/licenses/commercetools-sdk-java-history/index.json
+++ b/licenses/commercetools-sdk-java-history/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
diff --git a/licenses/commercetools-sdk-java-importapi/index.json b/licenses/commercetools-sdk-java-importapi/index.json
index b04bab874c6..ee273a505d7 100644
--- a/licenses/commercetools-sdk-java-importapi/index.json
+++ b/licenses/commercetools-sdk-java-importapi/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
diff --git a/licenses/index.json b/licenses/index.json
index b8a5f4ac024..854b8476440 100644
--- a/licenses/index.json
+++ b/licenses/index.json
@@ -72,7 +72,7 @@
         },
         {
             "moduleName": "com.datadoghq:datadog-api-client",
-            "moduleVersion": "2.33.1",
+            "moduleVersion": "2.34.1",
             "moduleUrls": [
                 "https://github.com/DataDog/datadog-api-client-java"
             ],
@@ -85,7 +85,7 @@
         },
         {
             "moduleName": "com.datadoghq:java-dogstatsd-client",
-            "moduleVersion": "4.4.3",
+            "moduleVersion": "4.4.4",
             "moduleUrls": [
                 "https://github.com/DataDog/java-dogstatsd-client"
             ],
@@ -102,7 +102,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -115,7 +115,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -128,7 +128,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -141,7 +141,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-dataformats-binary"
             ],
@@ -154,7 +154,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
@@ -167,7 +167,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-base"
             ],
@@ -180,7 +180,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.module:jackson-module-parameter-names",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names"
             ],
@@ -404,7 +404,7 @@
         },
         {
             "moduleName": "com.newrelic.agent.java:newrelic-api",
-            "moduleVersion": "8.19.0",
+            "moduleVersion": "8.20.0",
             "moduleUrls": [
                 "https://github.com/newrelic/newrelic-java-agent"
             ],
@@ -453,7 +453,7 @@
         },
         {
             "moduleName": "com.squareup.okio:okio",
-            "moduleVersion": "3.10.2"
+            "moduleVersion": "3.11.0"
         },
         {
             "moduleName": "com.squareup.okio:okio",
@@ -461,7 +461,7 @@
         },
         {
             "moduleName": "com.squareup.okio:okio-jvm",
-            "moduleVersion": "3.10.2",
+            "moduleVersion": "3.11.0",
             "moduleUrls": [
                 "https://github.com/square/okio/"
             ],
@@ -603,6 +603,19 @@
                 }
             ]
         },
+        {
+            "moduleName": "io.netty:netty-buffer",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
         {
             "moduleName": "io.netty:netty-codec",
             "moduleVersion": "4.1.119.Final",
@@ -616,6 +629,45 @@
                 }
             ]
         },
+        {
+            "moduleName": "io.netty:netty-codec",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-base",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-compression",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
         {
             "moduleName": "io.netty:netty-codec-dns",
             "moduleVersion": "4.1.119.Final",
@@ -642,6 +694,19 @@
                 }
             ]
         },
+        {
+            "moduleName": "io.netty:netty-codec-http",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
         {
             "moduleName": "io.netty:netty-codec-http2",
             "moduleVersion": "4.1.119.Final",
@@ -655,6 +720,32 @@
                 }
             ]
         },
+        {
+            "moduleName": "io.netty:netty-codec-marshalling",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
+        {
+            "moduleName": "io.netty:netty-codec-protobuf",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
         {
             "moduleName": "io.netty:netty-codec-socks",
             "moduleVersion": "4.1.119.Final",
@@ -668,6 +759,19 @@
                 }
             ]
         },
+        {
+            "moduleName": "io.netty:netty-codec-socks",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
         {
             "moduleName": "io.netty:netty-common",
             "moduleVersion": "4.1.119.Final",
@@ -681,6 +785,19 @@
                 }
             ]
         },
+        {
+            "moduleName": "io.netty:netty-common",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
         {
             "moduleName": "io.netty:netty-handler",
             "moduleVersion": "4.1.119.Final",
@@ -694,6 +811,19 @@
                 }
             ]
         },
+        {
+            "moduleName": "io.netty:netty-handler",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
         {
             "moduleName": "io.netty:netty-handler-proxy",
             "moduleVersion": "4.1.119.Final",
@@ -707,6 +837,19 @@
                 }
             ]
         },
+        {
+            "moduleName": "io.netty:netty-handler-proxy",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
         {
             "moduleName": "io.netty:netty-resolver",
             "moduleVersion": "4.1.119.Final",
@@ -720,6 +863,19 @@
                 }
             ]
         },
+        {
+            "moduleName": "io.netty:netty-resolver",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
         {
             "moduleName": "io.netty:netty-resolver-dns",
             "moduleVersion": "4.1.119.Final",
@@ -772,6 +928,19 @@
                 }
             ]
         },
+        {
+            "moduleName": "io.netty:netty-transport",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
         {
             "moduleName": "io.netty:netty-transport-classes-epoll",
             "moduleVersion": "4.1.119.Final",
@@ -850,9 +1019,22 @@
                 }
             ]
         },
+        {
+            "moduleName": "io.netty:netty-transport-native-unix-common",
+            "moduleVersion": "4.2.0.Final",
+            "moduleUrls": [
+                "https://netty.io/"
+            ],
+            "moduleLicenses": [
+                {
+                    "moduleLicense": "Apache License, Version 2.0",
+                    "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+                }
+            ]
+        },
         {
             "moduleName": "io.opentelemetry:opentelemetry-api",
-            "moduleVersion": "1.48.0",
+            "moduleVersion": "1.49.0",
             "moduleUrls": [
                 "https://github.com/open-telemetry/opentelemetry-java"
             ],
@@ -865,7 +1047,7 @@
         },
         {
             "moduleName": "io.opentelemetry:opentelemetry-context",
-            "moduleVersion": "1.48.0",
+            "moduleVersion": "1.49.0",
             "moduleUrls": [
                 "https://github.com/open-telemetry/opentelemetry-java"
             ],
@@ -878,7 +1060,7 @@
         },
         {
             "moduleName": "io.projectreactor.netty:reactor-netty-core",
-            "moduleVersion": "1.2.4",
+            "moduleVersion": "1.2.5",
             "moduleUrls": [
                 "https://github.com/reactor/reactor-netty"
             ],
@@ -891,7 +1073,7 @@
         },
         {
             "moduleName": "io.projectreactor.netty:reactor-netty-http",
-            "moduleVersion": "1.2.4",
+            "moduleVersion": "1.2.5",
             "moduleUrls": [
                 "https://github.com/reactor/reactor-netty"
             ],
@@ -904,7 +1086,7 @@
         },
         {
             "moduleName": "io.projectreactor:reactor-core",
-            "moduleVersion": "3.7.4",
+            "moduleVersion": "3.7.5",
             "moduleUrls": [
                 "https://github.com/reactor/reactor-core"
             ],
@@ -1089,7 +1271,7 @@
         },
         {
             "moduleName": "org.apache.commons:commons-text",
-            "moduleVersion": "1.13.0",
+            "moduleVersion": "1.13.1",
             "moduleUrls": [
                 "https://commons.apache.org/proper/commons-text"
             ],
@@ -1116,7 +1298,7 @@
         },
         {
             "moduleName": "org.apache.httpcomponents.client5:httpclient5",
-            "moduleVersion": "5.4.2",
+            "moduleVersion": "5.4.4",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -1126,7 +1308,7 @@
         },
         {
             "moduleName": "org.apache.httpcomponents.core5:httpcore5",
-            "moduleVersion": "5.3.3",
+            "moduleVersion": "5.3.4",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -1136,7 +1318,7 @@
         },
         {
             "moduleName": "org.apache.httpcomponents.core5:httpcore5-h2",
-            "moduleVersion": "5.3.3",
+            "moduleVersion": "5.3.4",
             "moduleLicenses": [
                 {
                     "moduleLicense": "Apache License, Version 2.0",
@@ -1745,7 +1927,7 @@
         },
         {
             "moduleName": "org.javamoney.moneta:moneta-core",
-            "moduleVersion": "1.4.4",
+            "moduleVersion": "1.4.5",
             "moduleUrls": [
                 "http://javamoney.org",
                 "http://www.javamoney.org"
@@ -1836,7 +2018,7 @@
         },
         {
             "moduleName": "org.jetbrains.kotlin:kotlin-stdlib",
-            "moduleVersion": "2.1.0",
+            "moduleVersion": "2.1.20",
             "moduleUrls": [
                 "https://kotlinlang.org/"
             ],
diff --git a/licenses/rmf-java-base/index.json b/licenses/rmf-java-base/index.json
index 44d328e5e3b..9107a9cd8cb 100644
--- a/licenses/rmf-java-base/index.json
+++ b/licenses/rmf-java-base/index.json
@@ -2,7 +2,7 @@
     "dependencies": [
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-annotations",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -15,7 +15,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-core",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-core"
             ],
@@ -28,7 +28,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.core:jackson-databind",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson"
             ],
@@ -41,7 +41,7 @@
         },
         {
             "moduleName": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-            "moduleVersion": "2.18.3",
+            "moduleVersion": "2.19.0",
             "moduleUrls": [
                 "https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310"
             ],
diff --git a/references.txt b/references.txt
index d5a7dc66939..376b772a029 100644
--- a/references.txt
+++ b/references.txt
@@ -403,3 +403,4 @@ f0288f95a5fe33fd2973df3f8290defb15129192
 761762c7caad45bc86b08db7021a033fff18ba90
 dec65e707130185745930bde27ce78ae64ab29c1
 356beed6a818fbf0e5a7f5c4e938d02c2ca174ec
+356beed6a818fbf0e5a7f5c4e938d02c2ca174ec